about summary refs log tree commit diff
path: root/pkgs/games/globulation/default.nix
diff options
context:
space:
mode:
authorDaniel Fox Franke <dfoxfranke@gmail.com>2015-08-29 01:09:24 -0400
committerDaniel Fox Franke <dfoxfranke@gmail.com>2015-08-29 01:09:24 -0400
commit7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534 (patch)
tree0410c2c702c65df4d89c379f8efa79e43e1b32b1 /pkgs/games/globulation/default.nix
parentd2dce19793069b6104ff7df29af92316e7fe3b50 (diff)
downloadnixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.tar
nixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.tar.gz
nixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.tar.bz2
nixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.tar.lz
nixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.tar.xz
nixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.tar.zst
nixlib-7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534.zip
glob2: fix build failure
The same issue was reported here to Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746854

Apparently this failure only cropped up with g++-4.9, but looking at
the code I have no idea how it ever worked without this patch.
Diffstat (limited to 'pkgs/games/globulation/default.nix')
-rw-r--r--pkgs/games/globulation/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index ed134bcf3c92..061f7c328d68 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 
-  patches = [ ./header-order.patch ];
+  patches = [ ./header-order.patch ./public-buildproject.patch ];
 
   postPatch = ''
     cp campaigns/tutorial-part4.map{,.orig}