* Get rid of many instances of "args: with args;", and other coding

guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782

pkgs/development/libraries/ccrtp/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }:
+
 stdenv.mkDerivation {
   name = "ccrtp-1.7.1";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn";
   };
 
-  buildInputs = [openssl pkgconfig libgcrypt commoncpp2];
+  buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ];
 
   meta = { 
     description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
     homepage = "http://www.gnu.org/software/ccrtp/";
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }