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

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, imagemagick, libpng, pkgconfig, glib, freetype
+, libjpeg, libxml2 }:
 
 stdenv.mkDerivation {
   name = "libwmf-0.2.8.4";
@@ -8,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
   };
 
-  buildInputs = [zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2];
+  buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ];
 
   meta = {
     description = "WMF library from wvWare";