* 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/tools/misc/cproto/default.nix

@@ -1,20 +1,21 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, flex, bison }:
+
+stdenv.mkDerivation {
   name = "cproto-4.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/cproto/cproto-4.6.tar.gz;
     sha256 = "0ilhkx9iwc5bh65q47mf68p39iyk07d52fv00z431nl6qcb9hp9j";
   };
 
-  buildInputs =(with args; [flex bison]);
+  buildInputs = [flex bison];
 
   # patch made by Joe Khoobyar copied from gentoo bugs
-  patches= ./cproto_patch ;
+  patches = ./cproto_patch;
 
   meta = { 
-      description = "generate C function prototypes from C source code";
-      homepage = http://cproto.sourceforge.net/;
-      license = "public domain";
+    description = "Tool to generate C function prototypes from C source code";
+    homepage = http://cproto.sourceforge.net/;
+    license = "public domain";
   };
 }