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

pkgs/development/tools/misc/indent/2.2.9.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz;
@@ -8,7 +8,7 @@ args : with args;
 
 		buildInputs = [];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let 
 	preBuild = FullDepEntry ("

pkgs/development/tools/misc/intltool/0.36.2.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 
 		propagatedBuildInputs = [perl perlXMLParser];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "intltool-0.36.2";

pkgs/development/tools/misc/ltrace/0.5-3deb.nix

@@ -1,7 +1,7 @@
 args : with args;	let 
         patch = ./ltrace_0.5-3.diff.gz;
-	localDefs = with (builderDefs {src="";} null);
-	 builderDefs {
+	localDefs = with builderDefs;
+	 builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;
@@ -17,7 +17,7 @@ args : with args;	let
 		  gunzip < ${patch} | patch -Np1
 		  sed -e s@-Werror@@ -i Makefile.in
 		'')["minInit" "doUnpack"];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let
 	preConfigure = FullDepEntry ("