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/audio/ladspa-plugins/default.nix

@@ -1,5 +1,5 @@
 args: with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = 
 		fetchurl {
 			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
@@ -7,7 +7,7 @@ args: with args;
 		};
 		buildInputs = [fftw ladspaH pkgconfig];
 		configureFlags = [];
-	} null;
+	};
 	in with localDefs;
 let
 	postInstall = FullDepEntry ("

pkgs/applications/audio/ladspa-plugins/ladspah.nix

@@ -6,10 +6,10 @@ let
 		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
 	};
 in
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		buildInputs = [];
 		inherit src;
-	} null;
+	};
 	in with localDefs;
 let
 	copyFile = FullDepEntry ("