diff options
| author | Daniel Fox Franke <dfoxfranke@gmail.com> | 2015-08-29 01:09:24 -0400 |
|---|---|---|
| committer | Daniel Fox Franke <dfoxfranke@gmail.com> | 2015-08-29 01:09:24 -0400 |
| commit | 7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534 (patch) | |
| tree | 0410c2c702c65df4d89c379f8efa79e43e1b32b1 /pkgs/games/globulation | |
| parent | d2dce19793069b6104ff7df29af92316e7fe3b50 (diff) | |
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')
| -rw-r--r-- | pkgs/games/globulation/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/globulation/public-buildproject.patch | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index ed134bcf3c926..061f7c328d683 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} diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/games/globulation/public-buildproject.patch new file mode 100644 index 0000000000000..1eaedf08820d0 --- /dev/null +++ b/pkgs/games/globulation/public-buildproject.patch @@ -0,0 +1,21 @@ +diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h +--- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400 ++++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400 +@@ -148,7 +148,7 @@ + TOP_TO_BOTTOM, + BOTTOM_TO_TOP + }; +- ++public: + struct BuildProject + { + int posX; +@@ -158,7 +158,7 @@ + int unitWorking; + int unitWorkingFuture; + }; +- ++private: + ///Initiates Game + void init(GameGUI *gui, MapEdit* edit); + |