From 7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 29 Aug 2015 01:09:24 -0400
Subject: [PATCH] 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.
---
pkgs/games/globulation/default.nix | 2 +-
.../globulation/public-buildproject.patch | 21 +++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 pkgs/games/globulation/public-buildproject.patch
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}
diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/games/globulation/public-buildproject.patch
new file mode 100644
index 000000000000..1eaedf08820d
--- /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);
+