diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-29 23:24:20 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-29 23:25:02 +0200 |
commit | b7703655749df57dd5cbc84b89cc3be4bc7358bc (patch) | |
tree | a3a84870d2fff43f9cce6abfc6f0961f0a5a156d /pkgs/games | |
parent | 971337a119d708d78a152f4d918694e7b5a2b7e8 (diff) | |
download | nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.gz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.bz2 nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.lz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.xz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.zst nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.zip |
ReRevert Merge x-updates into master
This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index b8043525719a..8aaf1f0865c4 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -10,8 +10,8 @@ in rec { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "9689"; - sha256 = "33285a971fee67324f8867de22582931135d8b8ee4cc2c41c46c3ba81eb99cb7"; + rev = "9773"; + sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611"; } + "/"; inherit buildInputs; @@ -27,7 +27,7 @@ rec { setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=variadic-macros" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" ''; /* doConfigure should be removed if not needed */ |