* 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/servers/http/lighttpd/default.nix

@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
+
+stdenv.mkDerivation {
   name = "lighttpd-1.4.19";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.lighttpd.net/download/lighttpd-1.4.19.tar.bz2;
     sha256 = "1mziqb36ik9z4lf1h5ccm1h4ab7d2hx0cz0g5425lwy374r34fd2";
   };
 
-  buildInputs =(with args; [pcre libxml2 zlib attr bzip2]);
+  buildInputs = [ pcre libxml2 zlib attr bzip2 ];
 
   meta = {
-      description = "Lightweight high-performance web server";
-      homepage = http://www.lighttpd.net/;
-      license = "BSD";
+    description = "Lightweight high-performance web server";
+    homepage = http://www.lighttpd.net/;
+    license = "BSD";
   };
 }