summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-09-04 21:02:14 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-09-04 21:02:14 +0200
commit4a2b6a63b61890aab22a6cf6e4dbafb5be814957 (patch)
treed2f253510a44524dcea6fd9240c4856bd0c11453 /pkgs/games
parent6734f37ec6b7d263374f0a6ef9a1cdeab68be1d2 (diff)
downloadnixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.tar
nixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.tar.gz
nixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.tar.bz2
nixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.tar.lz
nixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.tar.xz
nixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.tar.zst
nixlib-4a2b6a63b61890aab22a6cf6e4dbafb5be814957.zip
spring, warzone2100: work around build problems
I guess there was a slight API change in the last mesa update.
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/spring/default.nix2
-rw-r--r--pkgs/games/warzone2100/default.nix3
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 539be06bf7fa..69387f0cfd3a 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
   # reported upstream http://springrts.com/mantis/view.php?id=4305
   #enableParallelBuilding = true; # occasionally missing generated files on Hydra
 
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+
   postInstall = ''
     wrapProgram "$out/bin/spring" \
       --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib"
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 284d420fe7f2..0db90e95cc90 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
                       --replace "which %s" "${which}/bin/which %s"
   '';
   configureFlags = "--with-backend=qt --with-distributor=NixOS";
+
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+
   postInstall = []
     ++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
   meta = {