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

@@ -1,10 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2 }:
 
 stdenv.mkDerivation {
   name = "imlib2-1.3.0";
+  
   src = fetchurl {
     url = mirror://sourceforge/enlightenment/imlib2-1.3.0.tar.gz;
     sha256 = "1lrg7haqhmzpdb14cgp9vny5fanlwlyhf5n017v130in297gv1qj";
   };
-  buildInputs = [x11 libjpeg libtiff libungif libpng bzip2];
+  
+  buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
 }