summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-05-09 13:58:08 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-05-09 14:03:35 +0200
commitec3965d8d0b5594a9db11e6c9cd1c28d36e91cde (patch)
tree9bb0bc5ac4f3c6aaa170a9df5562f10e30ade47f /pkgs/games
parent84b0bf63b7f07dc1d9d19458dcbba6d02b4e2811 (diff)
downloadnixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.gz
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.bz2
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.lz
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.xz
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.zst
nixpkgs-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.zip
Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/sgt-puzzles/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 8aaf1f0865c..b8043525719 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 = "9773";
-   sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611";
+   rev = "9689";
+   sha256 = "33285a971fee67324f8867de22582931135d8b8ee4cc2c41c46c3ba81eb99cb7";
   } + "/";
 
   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"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=variadic-macros"
   '';
 
   /* doConfigure should be removed if not needed */