Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.

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

11 files changed, 31 insertions, 31 deletions

diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix
index 71bee68557ad..72c0997cc6a5 100644
--- a/pkgs/tools/X11/x11vnc/0.9.3.nix
+++ b/pkgs/tools/X11/x11vnc/0.9.3.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-  let localDefs = builderDefs (rec {
+args : with args; with builderDefs;
+  let localDefs = builderDefs.meta.function (rec {
     src = /* put a fetchurl here */
     fetchurl {
       url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;
@@ -10,7 +10,7 @@ args : with args; with builderDefs {src="";} null;
       zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto
       libXrandr randrproto libXext xextproto inputproto recordproto];
     configureFlags = [];
-  }) null; /* null is a terminator for sumArgs */
+  });
   in with localDefs;
 stdenv.mkDerivation rec {
   name = "x11vnc-"+version;
diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix
index 50dea60b8908..3966b852adce 100644
--- a/pkgs/tools/X11/x2vnc/1.7.2.nix
+++ b/pkgs/tools/X11/x2vnc/1.7.2.nix
@@ -1,6 +1,6 @@
 
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs (rec {
+args : with args; with builderDefs.meta.function {src="";};
+	let localDefs = builderDefs.meta.function ((rec {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
@@ -12,7 +12,7 @@ args : with args; with builderDefs {src="";} null;
 			ensureDir $out
 		'') ["defEnsureDir"];
 		configureFlags = [];
-	}) args null; /* null is a terminator for sumArgs */
+	}) // args); /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "x2vnc-"+version;
diff --git a/pkgs/tools/misc/dosfstools/2.11deb.nix b/pkgs/tools/misc/dosfstools/2.11deb.nix
index 375dcc6a8559..8878ee383257 100644
--- a/pkgs/tools/misc/dosfstools/2.11deb.nix
+++ b/pkgs/tools/misc/dosfstools/2.11deb.nix
@@ -1,10 +1,10 @@
-args : with args; with builderDefs {src="";} null;
+args : with args; with builderDefs;
     let patch = 
         fetchurl {
           url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11-2.3.diff.gz;
           sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld";
         };	
-      localDefs = builderDefs (rec {
+      localDefs = builderDefs.meta.function (rec {
         src = /* put a fetchurl here */
           fetchurl {
             url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz;
@@ -17,7 +17,7 @@ args : with args; with builderDefs {src="";} null;
         buildInputs = [];
         configureFlags = [];
 	makeFlags = " PREFIX=$out ";
-    }) null; /* null is a terminator for sumArgs */
+    });
     in with localDefs;
 stdenv.mkDerivation rec {
     name = "dosfstools-"+version;
diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
index e8d3705acc3d..a02df67fd584 100644
--- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
+++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
@@ -1,6 +1,6 @@
 
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 	src = /* put a fetchurl here */
 	if args ? src then args.src else fetchcvs {
 		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
@@ -12,7 +12,7 @@ args : with args;
 		buildInputs = [ocaml fuse postgresql pcre
 			e2fsprogs gnomevfs pkgconfig GConf];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let build = FullDepEntry ("
 	cd deps 
diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix
index 3a8a22a2f544..b6db8638601b 100644
--- a/pkgs/tools/misc/rlwrap/0.28.nix
+++ b/pkgs/tools/misc/rlwrap/0.28.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs {
+args : with args; with builderDefs;
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;
@@ -8,7 +8,7 @@ args : with args; with builderDefs {src="";} null;
 
 		buildInputs = [readline ];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "rlwrap-"+version;
diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix
index 22be0c941b73..130b128149b8 100644
--- a/pkgs/tools/networking/nc6/1.0.nix
+++ b/pkgs/tools/networking/nc6/1.0.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-let localDefs = builderDefs (rec {
+args : with args; with builderDefs;
+let localDefs = builderDefs.meta.function (rec {
     src = /* put a fetchurl here */
     fetchurl {
       url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
@@ -8,7 +8,7 @@ let localDefs = builderDefs (rec {
 
     buildInputs = [];
     configureFlags = [];
-    }) null; /* null is a terminator for sumArgs */
+    });
 in with localDefs;
 stdenv.mkDerivation rec {
   name = "nc6-"+version;
diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
index d93ab811438c..fa98d3d0ac6a 100644
--- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
+++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs {
+args : with args; with builderDefs;
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz;
@@ -14,7 +14,7 @@ args : with args; with builderDefs {src="";} null;
 		ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
 		'')
 		[ "minInit" "defEnsureDir" "doMakeInstall"];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "smbfs-fuse-"+version;
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index dd1b8831bb79..9a5468e8cc5f 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs (rec {
+args : with args; with builderDefs;
+	let localDefs = builderDefs.meta.function (rec {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip;
@@ -16,7 +16,7 @@ args : with args; with builderDefs {src="";} null;
 			ensureDir $out/bin
 			echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile
 		'') ["minInit" "addInputs" "defEnsureDir"];
-	}) null; /* null is a terminator for sumArgs */
+	});
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "bmrsa-"+version;
diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix
index a42837cf60d9..36109524831c 100644
--- a/pkgs/tools/security/seccure/0.3.nix
+++ b/pkgs/tools/security/seccure/0.3.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs (rec {
+args : with args; with builderDefs;
+	let localDefs = builderDefs.meta.function ((rec {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz;
@@ -12,7 +12,7 @@ args : with args; with builderDefs {src="";} null;
 			sed -e s@/usr/@$out/@g -i Makefile
 			ensureDir $out/bin $out/share/man/man1
 		'') ["minInit" "doUnpack" "defEnsureDir"];
-	}) args null; /* null is a terminator for sumArgs */
+	}) // args);
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "seccure-"+version;
diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix
index eedb788c777d..e35165be32b0 100644
--- a/pkgs/tools/security/ssss/0.5.nix
+++ b/pkgs/tools/security/ssss/0.5.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs (rec {
+args : with args; with builderDefs;
+	let localDefs = builderDefs.meta.function (rec {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
@@ -15,7 +15,7 @@ args : with args; with builderDefs {src="";} null;
 			ensureDir $out/bin $out/share/man/man1
 			echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
 		'') ["minInit" "doUnpack" "defEnsureDir"];
-	}) null; /* null is a terminator for sumArgs */
+	});
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "ssss-"+version;
diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix
index 6b14c91e6b89..c8ba4ac2418f 100644
--- a/pkgs/tools/system/gdmap/0.8.1.nix
+++ b/pkgs/tools/system/gdmap/0.8.1.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 		    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
 
 		buildInputs = [gtk pkgconfig libxml2 intltool gettext];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "gdmap"+version;