diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 18:01:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 18:01:17 +0000 |
| commit | f1598a8941287ed25deca83cc71c72c256089362 (patch) | |
| tree | b4735ba022095233ef2ea865de4145faead12f2e /pkgs/games/fsg | |
| parent | d67aefc19d29a1522b21152f508b90a1c0261c3d (diff) | |
* More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
Diffstat (limited to 'pkgs/games/fsg')
| -rw-r--r-- | pkgs/games/fsg/alt-builder.nix | 34 | ||||
| -rw-r--r-- | pkgs/games/fsg/default.nix | 4 |
2 files changed, 2 insertions, 36 deletions
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix deleted file mode 100644 index 837685db2d9f..000000000000 --- a/pkgs/games/fsg/alt-builder.nix +++ /dev/null @@ -1,34 +0,0 @@ -args: with args; - let localDefs = builderDefs.passthru.function { - buildInputs =[mesa wxGTK libX11 xproto]; - src = - fetchurl { - url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; - sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; - }; - }; - in with localDefs; -let - preBuild = fullDepEntry " - sed -e ' - s@currentProbIndex != 100@0@; - ' -i MainFrame.cpp; - " [minInit]; - - installPhase = fullDepEntry " - ensureDir \$out/bin \$out/libexec; - cp sand \$out/libexec; - echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg; - chmod a+x \$out/bin/fsg; - " [minInit defEnsureDir]; -in -stdenv.mkDerivation { - name = "fsg-4.4"; - builder = writeScript "fsg-4.4-builder" - (textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]); - - meta = { - description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand"; - inherit src; - }; -} diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 029c93d6690e..2752e565c58c 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, gtk, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; - buildInputs = [gtk glib pkgconfig mesa wxGTK libX11 xproto]; + buildInputs = [ gtk glib pkgconfig mesa wxGTK libX11 xproto ]; /* # One day Unicode will overcome? |