* 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

43 files changed, 240 insertions, 287 deletions

diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index bd7b66f21a1..1821d746ac4 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, libogg, libvorbis }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_mixer";
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index 6c8c79d701c..cbca42ef5df 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_net";
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 29c1df93a50..591a4bfbd6d 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, freetype }:
 
 stdenv.mkDerivation {
   name = "SDL_ttf-2.0.9";
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index b54680b3d3f..1bccf32b0f0 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -1,6 +1,8 @@
 # set VAMP_PATH ?
 # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
-args: with args;
+
+{ stdenv, fetchurl, pkgconfig, libsndfile }:
+
 rec {
 
   vampSDK = stdenv.mkDerivation {
@@ -17,8 +19,8 @@ rec {
       description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
       homepage = http://sourceforge.net/projects/vamp;
       license = "BSD";
-      maintainers = [args.lib.maintainers.marcweber];
-      platforms = args.lib.platforms.linux;
+      maintainers = [ stdenv.lib.maintainers.marcweber ];
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index d00e3f67f3c..2464a09f51a 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "babl-0.0.22";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
     sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "image pixel format coneversion libraray";
-      homepage = http://gegl.org/babl/;
-      license = "GPL3";
+    description = "Image pixel format conversion library";
+    homepage = http://gegl.org/babl/;
+    license = "GPL3";
   };
 }
diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 54bf2331bf7..419215a45a5 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig }:
+
 stdenv.mkDerivation {
   name = "boolstuff-0.1.12";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9";
   };
 
-  buildInputs = [pkgconfig];
+  buildInputs = [ pkgconfig ];
 
   meta = { 
-    description = "operations on boolean expression binary trees";
+    description = "Library for operations on boolean expression binary trees";
     homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 5424e7a73de..11b8fba8b04 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }:
+
 stdenv.mkDerivation {
   name = "ccrtp-1.7.1";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn";
   };
 
-  buildInputs = [openssl pkgconfig libgcrypt commoncpp2];
+  buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ];
 
   meta = { 
     description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
     homepage = "http://www.gnu.org/software/ccrtp/";
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index c30166d015c..950fe1baf08 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ilmbase }:
+
 stdenv.mkDerivation {
   name = "ctl-1.4.1";
 
@@ -7,8 +8,12 @@ stdenv.mkDerivation {
     sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
   };
 
-  propagatedBuildInputs =  [ilmbase];
-  configureFlags="--with-ilmbase-prefix=${ilmbase}";
+  patches = [ ./patch.patch ];
+  
+  propagatedBuildInputs = [ ilmbase ];
+  
+  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
+  
   #configurePhase = "
     #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
     #echo $CXXFLAGS
@@ -16,10 +21,9 @@ stdenv.mkDerivation {
   #";
 
   meta = {
-      description = "Color Transformation Language";
-      homepage = http://ampasctl.sourceforge.net;
-      license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
+    description = "Color Transformation Language";
+    homepage = http://ampasctl.sourceforge.net;
+    license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
   };
 
-  patches = [ ./patch.patch ];
 }
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index d1c0a825dea..f133217b202 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,19 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation {
   name = "faac-1.26";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/faac/faac-1.26.tar.gz;
     sha256 = "0ld9d8mn3yp90japzkqkicmjcggi7d8y9gn7cl1jdsb74bif4j2b";
   };
 
   preConfigure = "./bootstrap";
 
-  buildInputs =(with args; [autoconf automake libtool]);
+  buildInputs = [ autoconf automake libtool ];
 
   meta = {
-      description="open source MPEG-4 and MPEG-2 AAC encoder";
-      homepage = http://www.audiocoding.com/faac.html;
-      license = "LGPL";
+    description = "Open source MPEG-4 and MPEG-2 AAC encoder";
+    homepage = http://www.audiocoding.com/faac.html;
+    license = "LGPL";
   };
 }
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 0af3e4f5537..81474b62dc6 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,18 +1,16 @@
-args:
-args.stdenv.mkDerivation rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
   name = "fcgi-2.4.0";
 
-  src = args.fetchurl {
-    name = name + ".tar.gz";
+  src = fetchurl {
     url = http://www.fastcgi.com/dist/fcgi.tar.gz;
     sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "FastCGI  is a language independent, scalable, open extension to CG";
-      homepage = http://www.fastcgi.com/;
-      license = "FastCGI see LICENSE.TERMS";
+    description = "FastCGI  is a language independent, scalable, open extension to CG";
+    homepage = http://www.fastcgi.com/;
+    license = "FastCGI see LICENSE.TERMS";
   };
 }
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 79356b31b7e..6c506df3f89 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, python, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
   name = "gamin-0.1.9";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr";
   };
 
-  buildInputs = [python pkgconfig glib];
+  buildInputs = [ python pkgconfig glib ];
 
   # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
   # <sys/socket.h> with Glibc 2.9.
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index d3df5ce58d6..dde95364337 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,18 +1,15 @@
-args: with args;
-
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
-
-composableDerivation {} ( fixed : {
+{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
+, postgresql, mysql, libgeotiff }:
 
+composableDerivation.composableDerivation {} (fixed: {
   name = "gdal-1.7.1";
 
-
   src = fetchurl {
     url = ftp://ftp.remotesensing.org/gdal/gdal171.zip;
     md5 = "f5592cff69b239166c9b64ff81943b1a";
   };
 
-  buildInputs = [unzip libjpeg];
+  buildInputs = [ unzip libjpeg ];
 
   # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults
   preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0";
@@ -27,78 +24,11 @@ composableDerivation {} ( fixed : {
     "--with-geotiff=${libgeotiff}"
   ];
 
-  /* TODO
-    # --with-grass=ARG      Include GRASS support (GRASS 5.7+, ARG=GRASS install tree dir)
-    # --with-libgrass=ARG   Include GRASS support based on libgrass (GRASS 5.0+)
-  --with-cfitsio=ARG    Include FITS support (ARG=no or libcfitsio path)
-  --with-pcraster=ARG   Include PCRaster (libcsf) support (ARG=internal, no or path)
-  --with-netcdf=ARG     Include netCDF support (ARG=no or netCDF tree prefix)
-  --with-png=ARG        Include PNG support (ARG=internal, no or path)
-  --with-pcidsk=ARG     Path to external PCIDSK SDK, or internal (default), or old
-  --with-libtiff=ARG    Libtiff library to use (ARG=internal, yes or path)
-  --with-jpeg=ARG       Include JPEG support (ARG=internal, no or path)
-  --without-jpeg12        Disable JPEG 8/12bit TIFF support
-  --with-gif=ARG        Include GIF support (ARG=internal, no or path)
-  --with-ogdi=ARG       Include OGDI support (ARG=path)
-  --with-fme=ARG        Include FMEObjects support (ARG=FME_HOME path)
-  --with-hdf4=ARG       Include HDF4 support (ARG=path)
-  --with-hdf5=ARG       Include HDF5 support (ARG=path)
-  --with-jasper=ARG     Include JPEG-2000 support via JasPer library (ARG=path)
-  --with-ecw=ARG        Include ECW support (ARG=ECW SDK Path, yes or no)
-  --with-kakadu=ARG     Include Kakadu/JPEG2000 support
-  --with-mrsid=ARG      Include MrSID support (ARG=path to MrSID DSDK or no)
-  --with-jp2mrsid=ARG   Enable MrSID JPEG2000 support (ARG=yes/no)
-  --with-msg=ARG          Enable MSG driver (ARG=yes or no)
-  --without-bsb           Disable BSB driver (legal issues pending
-  --with-oci=[ARG]        use Oracle OCI API from given Oracle home
-                          (ARG=path); use existing ORACLE_HOME (ARG=yes);
-                          disable Oracle OCI support (ARG=no)
-  --with-oci-include=[DIR]
-                          use Oracle OCI API headers from given path
-  --with-oci-lib=[DIR]    use Oracle OCI API libraries from given path
-  --without-grib          Disable GRIB driver
-  --without-ogr         Don't build OGR into shared library
-  --with-ingres=ARG     Include Ingres (ARG=$II_SYSTEM)
-  --with-xerces=[ARG]     use Xerces C++ Parser from given prefix (ARG=path);
-                          check standard prefixes (ARG=yes); disable (ARG=no)
-  --with-xerces-inc=[DIR] path to Xerces C++ Parser headers
-  --with-xerces-lib=[ARG] link options for Xerces C++ Parser libraries
-  --with-expat=[ARG]      use Expat XML Parser from given prefix (ARG=path);
-                          check standard prefixes (ARG=yes); disable (ARG=no)
-  --with-expat-inc=[DIR]  path to Expat XML Parser headers
-  --with-expat-lib=[ARG]  link options for Expat XML Parser libraries
-  --with-odbc=ARG       Include ODBC support (ARG=no or path)
-  --with-dods-root=ARG  Include DODS support (ARG=no or absolute path)
-  --with-curl=ARG       Include curl (ARG=path to curl-config.)
-  --with-spatialite=ARG Include SpatiaLite support (ARG=no or path)
-  --with-sqlite3=[ARG]    use SQLite 3 library [default=yes], optionally
-                          specify the prefix for sqlite3 library
-  --with-dwgdirect=path Include DWG direct support
-  --with-dwg-plt=platform DWGdirect Platform, defaults to lnxX86
-  --with-idb=DIR        Include Informix DataBlade support (DIR points to Informix root)
-  --with-sde=DIR        Include ESRI SDE support (DIR is SDE's install dir).
-  --with-sde-version=VERSION NUMBER  Set ESRI SDE version number (Default is 80).
-  --without-vfk         Disable VFK support
-  --with-epsilon=ARG    Include EPSILON support (ARG=no, yes or libepsilon install root path)
-  --with-geos=ARG         Include GEOS support (ARG=yes, no or geos-config
-                          path)
-  --without-pam         Disable PAM (.aux.xml) support
-  --with-static-proj4=ARG Compile with PROJ.4 statically (ARG=no or path)
-  --with-gdal-ver=ARG   Override GDAL version
-  --with-macosx-framework         Build and install GDAL as a Mac OS X Framework
-  --with-perl           Enable perl bindings
-  --with-php            Enable php bindings
-  --with-ruby           Enable Ruby bindings
-  --with-python       Enable python bindings
-  --with-pymoddir=ARG   Override Old-gen Python package install dir
-
-  */
-
   meta = {
-    description = "translator library for raster geospatial data formats";
+    description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;
     license = "X/MIT";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 56b51d71ca6..f87211195d5 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "gmm-3.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://download.gna.org/getfem/stable/gmm-3.0.tar.gz;
     sha256 = "1lc34w68s0rhii6caklvq2pyc3jaa4g6kza948ya8ha6rr8d1ypp";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "generic C++ template library for sparse, dense and skyline matrices";
-      homepage = http://home.gna.org/getfem/gmm_intro.html;
-      license = "LGLP2.1"; # or later
+    description = "Generic C++ template library for sparse, dense and skyline matrices";
+    homepage = http://home.gna.org/getfem/gmm_intro.html;
+    license = "LGLP2.1"; # or later
   };
 }
diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix
index 36b74a1980e..6dea424075d 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/pkgs/development/libraries/ilbc/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, msilbc }:
 
 stdenv.mkDerivation {
   name = "ilbc-rfc3951";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   src = stdenv.mkDerivation {
     name = "ilbc-rfc3951.tar.gz";
     src = msilbc.src;
-	outputHashAlgo = "sha256";
+    outputHashAlgo = "sha256";
     outputHash = "0f6scsp72bz2ifscd8c0x57ipcxi2i4a9b4nwlnwx7a7a0hrazhj";
     phases = "unpackPhase installPhase";
     installPhase = "cp ilbc-rfc3951.tar.gz \${out}";
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index f289dd8ee0f..c038adf632f 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/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 ];
 }
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 4c7cbb4e691..0dbab1a7ac4 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, cfitsio, libusb, zlib }:
+
 stdenv.mkDerivation {
   name = "indilib-0.5";
 
@@ -7,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "02km37m3d2l8c9wnab24zm2k6a3l8h2fali74jhm4z3khwr277ad";
   };
 
-  propagatedBuildInputs = [cfitsio libusb zlib];
+  propagatedBuildInputs = [ cfitsio libusb zlib ];
 
   meta = {
     homepage = http://indi.sf.net;
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 46fe5b6ef03..9b45dbb91ec 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,34 +1,35 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec{
-	name = "iniparser-3.0b";
+  name = "iniparser-3.0b";
 
-	src = fetchurl {
-		url = "${meta.homepage}/iniparser3.0b.tar.gz";
-		sha256 = "09klyddnqlpbgkv4cmh6ww9q5pv6nf1vfmzw4z256p51rnnlqqwa";
-	};
+  src = fetchurl {
+    url = "${meta.homepage}/iniparser3.0b.tar.gz";
+    sha256 = "09klyddnqlpbgkv4cmh6ww9q5pv6nf1vfmzw4z256p51rnnlqqwa";
+  };
 
-	patches = ./no-usr.patch;
+  patches = ./no-usr.patch;
 
-	buildFlags = "libiniparser.so";
+  buildFlags = "libiniparser.so";
 
-	installPhase = ''
-	ensureDir $out/lib
-	cp libiniparser.so.0 $out/lib
-	ln -s libiniparser.so.0 $out/lib/libiniparser.so
+  installPhase = ''
+    ensureDir $out/lib
+    cp libiniparser.so.0 $out/lib
+    ln -s libiniparser.so.0 $out/lib/libiniparser.so
 
-	ensureDir $out/include
-	cp src/*.h $out/include
+    ensureDir $out/include
+    cp src/*.h $out/include
 
-	ensureDir $out/share/doc/${name}
-	for i in AUTHORS INSTALL LICENSE README; do
-		bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
-	done;
-	cp -r html $out/share/doc/${name}
-	'';
+    ensureDir $out/share/doc/${name}
+    for i in AUTHORS INSTALL LICENSE README; do
+      bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
+    done;
+    cp -r html $out/share/doc/${name}
+  '';
 
-	meta = {
-		homepage = http://ndevilla.free.fr/iniparser;
-		description = "Free standalone ini file parsing library";
-		license = "MIT";
-	};
+  meta = {
+    homepage = http://ndevilla.free.fr/iniparser;
+    description = "Free standalone ini file parsing library";
+    license = "MIT";
+  };
 }
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 672ca202354..07753c86403 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libraw1394 }:
+
 stdenv.mkDerivation {
   name = "libavc1394-0.5.3";
 
@@ -7,12 +8,12 @@ stdenv.mkDerivation {
     sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
   };
 
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [libraw1394];
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ libraw1394 ];
 
   meta = { 
-      description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
-      homepage = http://sourceforge.net/projects/libavc1394/;
-      license = [ "GPL" "LGPL" ];
+    description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
+    homepage = http://sourceforge.net/projects/libavc1394/;
+    license = [ "GPL" "LGPL" ];
   };
 }
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 69011a6ef97..3213c0634ba 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,6 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   flags = { }
     # TODO! implement flags
@@ -14,15 +16,13 @@ composableDerivation {} {
 
   name = "libdv-1.0.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
   meta = {
-    description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
+    description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
-    # you can choose one of the following licenses: 
-    license = [];
   };
 }
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 76434d2c30b..7c2c9129c26 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   name = "libexif-0.6.16";
@@ -8,5 +8,5 @@ stdenv.mkDerivation rec {
     sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v";
   };
 
-  buildInputs = [gettext];
+  buildInputs = [ gettext ];
 }
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 16272ebeb2b..920f40abd5a 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libtiff }:
+
 stdenv.mkDerivation {
   name = "libgeotiff-1.2.4";
 
@@ -7,10 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj";
   };
 
-  buildInputs = [libtiff];
+  buildInputs = [ libtiff ];
 
   meta = {
-    description = "library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
+    description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
     homepage = http://www.remotesensing.org/geotiff/geotiff.html;
     license = "X11";
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 51c06c0382b..ff22d1d032b 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, libpng }:
+
 stdenv.mkDerivation {
   name = "haru-2.1.0";
 
@@ -9,13 +10,13 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
 
-  buildInputs = [zlib libpng];
+  buildInputs = [ zlib libpng ];
 
   meta = { 
     description = "cross platform, open source library for generating PDF files";
     homepage = http://libharu.org/wiki/Main_Page;
     license = "ZLIB/LIBPNG"; # see README.
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index a2590a7de3f..d1337604260 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libraw1394 }:
+
 stdenv.mkDerivation rec {
   version = "1.2.0";
   name = "libiec61883-${version}";
@@ -9,12 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a";
   };
 
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [libraw1394];
+  buildInputs = [ pkgconfig ];
+  
+  propagatedBuildInputs = [ libraw1394 ];
 
   meta = { 
-      description = "TODO";
-      homepage = http://www.linux1394.org;
-      license = "LGPL";
-    };
+    homepage = http://www.linux1394.org;
+    license = "LGPL";
+  };
 }
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;
   };
 }
diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index e2d1c25d013..e24a93c1043 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libnova-0.12.1";
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 2ca8c543fa9..a910d11f410 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "libraw1394-1.3.0";
 
@@ -8,8 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   meta = { 
-      description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
-      homepage = "http://www.linux1394.org";
-      license = ["GPL" "LGPL"];
+    description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
+    homepage = http://www.linux1394.org;
+    license = ["GPL" "LGPL"];
   };
 }
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 05ffb27bc0a..e02cedeeab3 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, librdf_raptor, ladspaH, openssl, zlib }:
+
 stdenv.mkDerivation {
   name = "liblrdf-0.4.0";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm";
   };
 
-  buildInputs = [pkgconfig librdf_raptor ladspaH openssl zlib];
+  buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ];
 
   meta = { 
     description = "A lightweight RDF library with special support for LADSPA plugins.";
     homepage = http://sourceforge.net/projects/lrdf/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index 0ddb45be30c..738369e796a 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libxml2, curl }:
+
 stdenv.mkDerivation rec {
   name = "raptor-1.4.21";
 
@@ -7,15 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca";
   };
 
-  buildInputs = [
-    #optional
-    libxml2 curl];
+  buildInputs = [ libxml2 curl ];
 
   meta = { 
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index ee99a173b6f..681453985b9 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, librdf_raptor, gmp, pkgconfig, pcre, libxml2 }:
+
 stdenv.mkDerivation rec {
   name = "rasqal-0.9.19";
 
@@ -7,23 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08";
   };
 
-  buildInputs = [
-    librdf_raptor
-    gmp /*or mpfr*/
-    pkgconfig
-    #optional
-    pcre libxml2 
-    ];
+  buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ];
 
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor"
   '';
 
   meta = { 
-    description = "library that handles Resource Description Framework (RDF)";
+    description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index a30a2884c6a..911145c5b74 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,23 +1,23 @@
-args: with args;
-stdenv.mkDerivation {
+{ stdenv, fetchurl }:
 
-  name = "libsamplerate-0.1.2";
+stdenv.mkDerivation rec {
+  name = "libsamplerate-0.1.7";
 
-  src = args.fetchurl {
-    url = http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz;
+  src = fetchurl {
+    url = "http://www.mega-nerd.com/SRC/${name}.tar.gz";
     sha256 = "1m1iwzpcny42kcqv5as2nyb0ggrb56wzckpximqpp2y74dipdf4q";
   };
 
-
-  buildInputs = ["pkgconfig"];
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW
   #--disable-cpu-clip      disable tricky cpu specific clipper
 
-  configurePhase = "
-   export LIBSAMPLERATE_CFLAGS=\"-I \$libsamplerate/include\"
-   export LIBSAMPLERATE_LIBS=\"-L \$libsamplerate/libs\"
-   ./configure --prefix=\$out";
+  configurePhase =
+    ''
+      export LIBSAMPLERATE_CFLAGS="-I $libsamplerate/include"
+      export LIBSAMPLERATE_LIBS="-L $libsamplerate/libs"
+      ./configure --prefix=$out
+    '';
 
   meta = {
     description = "Sample Rate Converter for audio";
diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
index 9dd50c37c61..ba11e0752b2 100644
--- a/pkgs/development/libraries/libsigsegv/2.5.nix
+++ b/pkgs/development/libraries/libsigsegv/2.5.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libsigsegv-2.5";
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index 7f7d7693182..95740882a93 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/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";
diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index 857197ea0c1..1754539a5f1 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }:
 
 stdenv.mkDerivation rec {
   name = "libzrtpcpp-1.4.1";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0gj5xiv15xnxdbppa06fy02j8jg0zm1capva4nhbpgzg08n7p8y0";
   };
 
-  buildInputs = [commoncpp2 openssl pkgconfig ccrtp];
+  buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ];
 
   meta = { 
     description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
     homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP";
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/openalSoft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index f0bce75e07a..59851eda25a 100644
--- a/pkgs/development/libraries/openalSoft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, cmake, alsaLib }:
+
 stdenv.mkDerivation {
 #The current release is still in a testing phase, though it should be stable
 # (neither the ABI or API will break). Please try it out and let me know how it
@@ -11,11 +12,11 @@ stdenv.mkDerivation {
     sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7";
   };
 
-  buildInputs = [cmake alsaLib];
+  buildInputs = [ cmake alsaLib ];
   
   meta = {
-      description = "openal alternative";
-      homepage = http://kcat.strangesoft.net/openal.html;
-      license = "GPL2";
+    description = "OpenAL alternative";
+    homepage = http://kcat.strangesoft.net/openal.html;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/development/libraries/proj.4/default.nix b/pkgs/development/libraries/proj/default.nix
index ffb3bed5054..6e3cc7cac55 100644
--- a/pkgs/development/libraries/proj.4/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "proj-4.5.0";
 
@@ -8,8 +9,8 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-      description = "Cartographic Projections Library";
-      homepage = http://proj.maptools.org;
-      license = "MIT";
+    description = "Cartographic Projections Library";
+    homepage = http://proj.maptools.org;
+    license = "MIT";
   };
 }
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index 631a7622406..be219f1f288 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -1,14 +1,15 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
-	name = "pth-2.0.7";
-	
-	src = fetchurl {
-		url = "mirror://gnu/pth/${name}.tar.gz";
-		sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
-	};
+  name = "pth-2.0.7";
+  
+  src = fetchurl {
+    url = "mirror://gnu/pth/${name}.tar.gz";
+    sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
+  };
 
-	meta = {
-		description = "The GNU Portable Threads";
-		homepage = http://www.gnu.org/software/pth;
-	};
+  meta = {
+    description = "The GNU Portable Threads library";
+    homepage = http://www.gnu.org/software/pth;
+  };
 }
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
index a36d7870cc2..c208d5b9fe6 100644
--- a/pkgs/development/libraries/readline/readline5.nix
+++ b/pkgs/development/libraries/readline/readline5.nix
@@ -1,11 +1,14 @@
-args: with args;
+{ stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
   name = "readline-5.2";
+  
   src = fetchurl {
     url = mirror://gnu/readline/readline-5.2.tar.gz;
     sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
   };
+  
   propagatedBuildInputs = [ncurses];
+  
   patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
 }
diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix
index cb18a8509bf..f9de62e7cfa 100644
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -1,8 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, cmake, rLang, zlib }:
 
 stdenv.mkDerivation rec {
   name = "biolib";
+  
   version = "0.0.1";
+  
   src = fetchurl {
     url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz";
     sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688";
@@ -11,11 +13,14 @@ stdenv.mkDerivation rec {
   buildInputs = [cmake rLang zlib];
 
   meta = {
-    description     = "BioLib";
-    longDescription = ''BioLib brings together a set of opensource libraries
-written in C/C++ and makes them available for major Bio* languages: BioPerl,
-BioRuby, BioPython'';
-    license     = "GPL2";
-    homepage    = http://biolib.open-bio.org/; 
+    description = "BioLib";
+    longDescription =
+      ''
+        BioLib brings together a set of opensource libraries written
+        in C/C++ and makes them available for major Bio* languages:
+        BioPerl, BioRuby, BioPython
+      '';
+    license = "GPL2";
+    homepage = http://biolib.open-bio.org/; 
   };
 }
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 5d9167d00ec..e2d9083eda4 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
   name = "atlas-3.9.11";
+  
   src = fetchurl {
     url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
     sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
@@ -13,11 +14,11 @@ stdenv.mkDerivation {
   # the manual says you should pass -fPIC as configure arg .. It works
   configureFlags = "-Fa alg -fPIC";
 
-  buildInputs = [gfortran];
+  buildInputs = [ gfortran ];
 
   meta = {
-    description     = "Atlas library";
-    license     = "GPL";
-    homepage    = http://math-atlas.sourceforge.net/;
+    description = "Atlas library";
+    license = "GPL";
+    homepage = http://math-atlas.sourceforge.net/;
   };
 }
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 5e852e3e245..93a01a3d2bc 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,10 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, libogg }:
 
 stdenv.mkDerivation rec {
   name = "speex-1.2rc1";
+  
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
-	sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
+    sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
   };
-  buildInputs = [libogg];
+  
+  buildInputs = [ libogg ];
 }
diff --git a/pkgs/development/libraries/telepathy-gabble/default.nix b/pkgs/development/libraries/telepathy-gabble/default.nix
index 67ffa950c95..c188f271742 100644
--- a/pkgs/development/libraries/telepathy-gabble/default.nix
+++ b/pkgs/development/libraries/telepathy-gabble/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, loudmouth }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.7.2";
diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy-glib/default.nix
index 76485404568..5864253bbb4 100644
--- a/pkgs/development/libraries/telepathy-glib/default.nix
+++ b/pkgs/development/libraries/telepathy-glib/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.7.0";
diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
index 28bab029172..e1238578edc 100644
--- a/pkgs/development/libraries/wvstreams/default.nix
+++ b/pkgs/development/libraries/wvstreams/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
+
 stdenv.mkDerivation {
   name = "wvstreams-4.6.1";
 
@@ -11,13 +12,13 @@ stdenv.mkDerivation {
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
   '';
 
-  buildInputs = [qt4 dbus zlib openssl readline perl];
+  buildInputs = [ qt4 dbus zlib openssl readline perl ];
 
   meta = {
-    description = "network programming library in C++";
+    description = "Network programming library in C++";
     homepage = http://alumnit.ca/wiki/index.php?page=WvStreams;
     license = "LGPL";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }