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/applications/window-managers/compiz/0.6.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://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2;
@@ -21,7 +21,7 @@ args : with args;
 			"--enable-annotate" "--enable-librsvg"] ++ 
 			(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
 		patches = [ ./glx-patch-0.6.2.patch ];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let
 	postAll = FullDepEntry ("

pkgs/applications/window-managers/compiz/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz/compiz-0.7.4.tar.bz2;
@@ -22,7 +22,7 @@ args : with args;
 			"--enable-annotate" "--enable-librsvg"] ++ 
 			(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
 		patches = [ ./glx-patch-0.6.2.patch ];
-	} null; /* null is a terminator for sumArgs */
+	};
 	in with localDefs;
 let
 	postAll = FullDepEntry ("

pkgs/applications/window-managers/fbpanel/4.12.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz;
@@ -9,7 +9,7 @@ args : with args;
 		buildInputs = [libX11 gtk pkgconfig libXmu libXpm 
 		  libpng libjpeg libtiff librsvg];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	}; /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "fbpanel";