* 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

1 files changed, 7 insertions, 9 deletions

diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index eb574fbc8c8..c65c62eaca7 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake, autoconf, libtool }:
+
 stdenv.mkDerivation {
   name = "libmng-1.0.10";
 
@@ -7,18 +8,15 @@ stdenv.mkDerivation {
     sha256 = "06415s40gz833s1v1q7c04c0m49p4sc87ich0vpdid2ldj0pf53v";
   };
 
-  preConfigure = "
-    unmaintained/autogen.sh
-    #cp makefiles/makefile.linux Makefile
-  ";
+  preConfigure = "unmaintained/autogen.sh";
 
-  buildInputs = [zlib libpng libjpeg lcms automake autoconf libtool];
+  buildInputs = [ zlib libpng libjpeg lcms automake autoconf libtool ];
 
   meta = { 
-    description = "THE reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
+    description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = http://sourceforge.net/projects/libmng;
     license = "zlib/libpng";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }