public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spring, warzone2100: work around build problems 

I guess there was a slight API change in the last mesa update.
This commit is contained in:
Vladimír Čunát 2014-09-04 21:02:14 +02:00
parent 6734f37ec6
commit 4a2b6a63b6
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/spring/default.nix
View File

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
# reported upstream http://springrts.com/mantis/view.php?id=4305 # reported upstream http://springrts.com/mantis/view.php?id=4305
#enableParallelBuilding = true; # occasionally missing generated files on Hydra #enableParallelBuilding = true; # occasionally missing generated files on Hydra
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
postInstall = '' postInstall = ''
wrapProgram "$out/bin/spring" \ wrapProgram "$out/bin/spring" \
--prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib" --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib"

3
pkgs/games/warzone2100/default.nix
View File

@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
--replace "which %s" "${which}/bin/which %s" --replace "which %s" "${which}/bin/which %s"
''; '';
configureFlags = "--with-backend=qt --with-distributor=NixOS"; configureFlags = "--with-backend=qt --with-distributor=NixOS";
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
postInstall = [] postInstall = []
++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; ++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
meta = { meta = {