diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-02-18 10:29:40 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-02-18 10:29:40 +0000 |
| commit | 89d1b7881f707c1a374af77eef7deae333c27476 (patch) | |
| tree | 38d219b0a35338c9962808254dcd0b48a52e9d62 /pkgs/games | |
| parent | 5fc64e5f9cd6def6a22cb518b5549280af084ebe (diff) | |
| download | nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.tar nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.tar.gz nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.tar.bz2 nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.tar.lz nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.tar.xz nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.tar.zst nixpkgs-89d1b7881f707c1a374af77eef7deae333c27476.zip | |
Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge
svn path=/nixpkgs/trunk/; revision=20093
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 83765c8f006..bf5ecbaa44f 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -2,16 +2,16 @@ a : let fetchsvn = a.fetchsvn; - version = a.lib.attrByPath ["version"] "r8541" a; + version = a.lib.attrByPath ["version"] "r8541" a; buildInputs = with a; [ - gtk glib pkgconfig libX11 perl + gtk pkgconfig libX11 perl ]; in rec { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "8842"; - sha256 = "0rx3pxd1ci9x1mlw1jfmwd0fpcyv76vv6jraxfrxcykxx62qg479"; + rev = "8872"; + sha256 = "16hcrhkl6plzdhw60g7i4vgkxcc4mw4h4bzg2myy5cfhpx7y0m9s"; } + "/"; inherit buildInputs; @@ -26,11 +26,7 @@ rec { '' ["minInit" "doUnpack" "addInputs"]; /* doConfigure should be removed if not needed */ - phaseNames = ["addInputs" "doExport" "mkMakefiles" "doMakeInstall"]; - - doExport = a.noDepEntry '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11" - ''; + phaseNames = ["addInputs" "mkMakefiles" "doMakeInstall"]; name = "sgt-puzzles-" + version; meta = { |