Added XScreensaver; also changed version-stub.nix (now it does sumArgs itself, and requires builderDefs to be used) and added a merge of composing-builder and declarative flag processing.

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

1 files changed, 26 insertions, 2 deletions

diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index ae5224f71011..01940499d610 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -186,7 +186,7 @@ args: with args; with stringsWithDeps; with lib;
 	) [minInit];
 
 	doConfigure = FullDepEntry ("
-		./configure --prefix=\"\$prefix\" ${toString (getAttr ["configureFlags"] "" args)}
+		./configure --prefix=\"\$prefix\" ${toString configureFlags}
 	") [minInit addInputs doUnpack];
 
 	doAutotools = FullDepEntry ("
@@ -200,7 +200,7 @@ args: with args; with stringsWithDeps; with lib;
 	")[minInit addInputs doUnpack];
 
 	doMake = FullDepEntry ("	
-		make ${toString (getAttr ["makeFlags"] "" args)}
+		make ${toString makeFlags}
 	") [minInit addInputs doUnpack];
 
 	doUnpack = toSrcDir (toString src);
@@ -269,4 +269,28 @@ args: with args; with stringsWithDeps; with lib;
 	textClosure = textClosureMap makeNest;
 
 	inherit noDepEntry FullDepEntry PackEntry;
+
+	defList = (getAttr ["defList"] [] args);
+	getVal = getValue args defList;
+	check = checkFlag args;
+	reqsList = getAttr ["reqsList"] [] args;
+	buildInputsNames = filter (x: (null != getVal x))
+		(uniqList {inputList = 
+		(concatLists (map 
+		(x:(if (x==[]) then [] else builtins.tail x)) 
+		reqsList));});
+	configFlags = getAttr ["configFlags"] [] args;
+	buildFlags = getAttr ["buildFlags"] [] args;
+	nameSuffixes = getAttr ["nameSuffixes"] [] args;
+	autoBuildInputs = assert (checkReqs args defList reqsList);
+		filter (x: x!=null) (map getVal buildInputsNames);
+	autoConfigureFlags = condConcat "" configFlags check;
+	autoMakeFlags = condConcat "" buildFlags check;
+	useConfig = getAttr ["useConfig"] false args;
+	buildInputs = if useConfig then autoBuildInputs else getAttr ["buildInputs"] [] args;
+	configureFlags = if useConfig then autoConfigureFlags else 
+	    getAttr ["configureFlags"] "" args;
+	makeFlags = if useConfig then autoMakeFlags else getAttr ["makeFlags"] "" args;
+
+	inherit lib;
 }) // args