* 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/faac/default.nix

@@ -1,19 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation {
   name = "faac-1.26";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/faac/faac-1.26.tar.gz;
     sha256 = "0ld9d8mn3yp90japzkqkicmjcggi7d8y9gn7cl1jdsb74bif4j2b";
   };
 
   preConfigure = "./bootstrap";
 
-  buildInputs =(with args; [autoconf automake libtool]);
+  buildInputs = [ autoconf automake libtool ];
 
   meta = {
-      description="open source MPEG-4 and MPEG-2 AAC encoder";
-      homepage = http://www.audiocoding.com/faac.html;
-      license = "LGPL";
+    description = "Open source MPEG-4 and MPEG-2 AAC encoder";
+    homepage = http://www.audiocoding.com/faac.html;
+    license = "LGPL";
   };
 }