* Fix some more "args: with args".

svn path=/nixpkgs/trunk/; revision=22828

4 files changed, 61 insertions, 50 deletions

diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix
index 1890c6d0563..edbe99cd8b0 100644
--- a/pkgs/development/libraries/facile/default.nix
+++ b/pkgs/development/libraries/facile/default.nix
@@ -1,19 +1,26 @@
-args: with args;
+{ stdenv, fetchurl, ocaml }:
+
 stdenv.mkDerivation rec {
-	name = "facile-1.1";
-	src = fetchurl {
-		url = "${meta.homepage}/distrib/${name}.tar.gz";
-		sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
-	};
-	dontAddPrefix = 1;
-	patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
-	postConfigure = "make -C src .depend";
-	makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
-	buildInputs = [ocaml];
+  name = "facile-1.1";
+  
+  src = fetchurl {
+    url = "${meta.homepage}/distrib/${name}.tar.gz";
+    sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
+  };
+  
+  dontAddPrefix = 1;
+        
+  patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
+  
+  postConfigure = "make -C src .depend";
+  
+  makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
+  
+  buildInputs = [ ocaml ];
 
-	meta = {
-		homepage = http://www.recherche.enac.fr/log/facile;
-		license = "LGPL";
-		description = "A Functional Constraint Library";
-	};
+  meta = {
+    homepage = http://www.recherche.enac.fr/log/facile;
+    license = "LGPL";
+    description = "A Functional Constraint Library";
+  };
 }
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 5089316cd58..3b1900ae89c 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,19 +1,21 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
+, librsvg, pango, gtk }:
+        
+stdenv.mkDerivation {
   name = "gegl-0.0.22";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
     sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
   };
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
 
-  buildInputs =(with args; [pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk]  );
+  buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ];
 
   meta = { 
-      description = "graph based image processing framework";
-      homepage = http://www.gegl.org;
-      license = "GPL3";
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = "GPL3";
   };
 }
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index df241623b39..7776b4d0259 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,30 +1,31 @@
-# alsaLib vorbisTools python can be made  optional
+# alsaLib vorbisTools python can be made optional
 
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }:
+
+stdenv.mkDerivation {
   name = "snack-2.2.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz;
     sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
   };
 
-  configureFlags = "--with-tcl=${args.tcl}/lib --with-tk=${args.tk}/lib";
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib";
 
-  postUnpack=''sourceRoot="$sourceRoot/unix"'';
+  postUnpack = ''sourceRoot="$sourceRoot/unix"'';
 
-  buildInputs =(with args; [python tcl tk vorbisTools pkgconfig x11]);
+  buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ];
 
-  postInstall="aoeu";
+  postInstall = "aoeu";
 
-  installPhase=''
+  installPhase = ''
     ensureDir $out
     make install DESTDIR="$out" 
   '';
 
   meta = { 
-      description = "The Snack Sound Toolkit (Tcl)";
-      homepage = "http://www.speech.kth.se/snack/";
-      license = "GPL-2";
+    description = "The Snack Sound Toolkit (Tcl)";
+    homepage = http://www.speech.kth.se/snack/;
+    license = "GPL-2";
   };
 }
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.14.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 28eacd4e4e4..b2c172a4d57 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.14.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -1,19 +1,21 @@
-args: with args;
+{ composableDerivation, fetchurl, xapian, pkgconfig
+, python ? null, php ? null, ruby ? null }:
 
-let inherit (args.composableDerivation) composableDerivation wwf; in
-composableDerivation {} {
+let inherit (composableDerivation) wwf; in
 
-    name = "xapian-bindings-1.0.14";
+composableDerivation.composableDerivation {} {
 
-    src = fetchurl {
-      url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
-      sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
-    };
+  name = "xapian-bindings-1.0.14";
 
-    buildInputs = [xapian pkgconfig];
+  src = fetchurl {
+    url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
+    sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
+  };
+
+  buildInputs = [ xapian pkgconfig ];
 
-    # most interpreters aren't tested yet.. (see python for example how to do it)
-    flags =
+  # most interpreters aren't tested yet.. (see python for example how to do it)
+  flags =
          wwf {
            name = "python";
            enable = {
@@ -64,9 +66,8 @@ composableDerivation {} {
   };
 
   meta = { 
-      description = "bindings for the xapian library";
-      homepage = xapian.meta.homepage;
-      license = "GPLv2";
+    description = "Bindings for the Xapian library";
+    homepage = xapian.meta.homepage;
+    license = "GPLv2";
   };
-
 }