From 4a2b6a63b61890aab22a6cf6e4dbafb5be814957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Sep 2014 21:02:14 +0200
Subject: [PATCH] spring, warzone2100: work around build problems
I guess there was a slight API change in the last mesa update.
---
pkgs/games/spring/default.nix | 2 ++
pkgs/games/warzone2100/default.nix | 3 +++
2 files changed, 5 insertions(+)
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 = {