diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-08-19 05:54:09 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-08-19 05:54:09 +0000 |
| commit | 87ff8d6347cd99618bc8f9ff58ddf357ce38c522 (patch) | |
| tree | 304d18d1a67cf9e844bf9d772b2a5386d00aa5f0 /pkgs/games | |
| parent | b5b68ce414fabb63a782dd74e86e940350e9a662 (diff) | |
| download | nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.gz nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.bz2 nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.lz nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.xz nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.zst nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.zip | |
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
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/construo/0.2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/fsg/alt-builder.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/orbit/1.01.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix index 3d8600b8acd4..3d9da7f531ad 100644 --- a/pkgs/games/construo/0.2.2.nix +++ b/pkgs/games/construo/0.2.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://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz; @@ -10,7 +10,7 @@ args : with args; ++ (if args ? mesa then [args.mesa args.freeglut] else []) ; configureFlags = [""]; - } null; /* null is a terminator for sumArgs */ + }; in with localDefs; let preConfigure = FullDepEntry (" diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix index 7a0b9c3fbaea..c48041fe5e92 100644 --- a/pkgs/games/fsg/alt-builder.nix +++ b/pkgs/games/fsg/alt-builder.nix @@ -1,12 +1,12 @@ args: with args; - let localDefs = builderDefs { + let localDefs = builderDefs.meta.function { buildInputs =[(wxGTK null)]; src = fetchurl { url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; - } null; + }; in with localDefs; let preBuild = FullDepEntry " diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix index 488d77732aef..b60b617fc2c3 100644 --- a/pkgs/games/orbit/1.01.nix +++ b/pkgs/games/orbit/1.01.nix @@ -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 { sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri"; @@ -27,7 +27,7 @@ $out/dump/orbit "\$@" EOF chmod a+x $out/bin/space-orbit '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - } null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "space-orbit-"+version; |