diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-03 13:27:40 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-03 13:27:40 +0000 |
commit | fcad0b0a5a6563453d3793e010af8b11232f64ad (patch) | |
tree | 44d0f27cc059d027bee6fcfc1518dd6da15f6754 /pkgs/games/fsg | |
parent | 9efba4b3b068ebae3bc0d47e4095ff4807a4d3a7 (diff) | |
download | nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.gz nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.bz2 nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.lz nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.xz nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.zst nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.zip |
* Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just shouldn't contain newlines. E.g. write description = "Bla"; and not description = '' Bla ''; This pollutes "nix-env -qa --description" output. svn path=/nixpkgs/trunk/; revision=14310
Diffstat (limited to 'pkgs/games/fsg')
-rw-r--r-- | pkgs/games/fsg/alt-builder.nix | 6 | ||||
-rw-r--r-- | pkgs/games/fsg/default.nix | 38 |
2 files changed, 20 insertions, 24 deletions
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix index da0c127a6e74..dfc7c6c724eb 100644 --- a/pkgs/games/fsg/alt-builder.nix +++ b/pkgs/games/fsg/alt-builder.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation { (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; + 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 891ac488bf38..b67b1bcfc5f8 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,14 +1,14 @@ args: with args; + stdenv.mkDerivation { name = "fsg-4.4"; - src = - fetchurl { - url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; - sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; - }; + src = fetchurl { + url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; + sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; + }; - buildInputs =[gtk glib pkgconfig mesa (wxGTK null) libX11 xproto]; + buildInputs = [gtk glib pkgconfig mesa (wxGTK null) libX11 xproto]; /* # One day Unicode will overcome? @@ -29,22 +29,20 @@ stdenv.mkDerivation { cp -r . /tmp/fsg ";*/ - preBuild = " - sed -e ' - s@currentProbIndex != 100@0@; - ' -i MainFrame.cpp; - "; + preBuild = '' + sed -e ' + s@currentProbIndex != 100@0@; + ' -i MainFrame.cpp + ''; - installPhase = " - 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; - "; + installPhase = '' + 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 + ''; meta = { - description = " - Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand. -"; + description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand"; }; } |