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/junicode/junicode-0.6.15.zip;
@@ -13,7 +13,7 @@ args : with args; with builderDefs {src="";} null;
ensureDir $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf
'') ["minInit" "addInputs" "defEnsureDir"];
}) null; /* null is a terminator for sumArgs */
});
in with localDefs;
stdenv.mkDerivation rec {
name = "junicode-"+version;