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
This commit is contained in:
Michael Raskin
2008-08-19 05:54:09 +00:00
parent b5b68ce414
commit 87ff8d6347
51 changed files with 224 additions and 181 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;