pyrox.dev / nixpkgs
lol
fork atom

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.

Daniel Fox Franke 7f26d95d d2dce197

+22 -1
unified split
+1 -1
pkgs/games/globulation/default.nix
··· 18 sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; 19 }; 20 21 - patches = [ ./header-order.patch ]; 22 23 postPatch = '' 24 cp campaigns/tutorial-part4.map{,.orig}
··· 18 sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; 19 }; 20 21 + patches = [ ./header-order.patch ./public-buildproject.patch ]; 22 23 postPatch = '' 24 cp campaigns/tutorial-part4.map{,.orig}
+21
pkgs/games/globulation/public-buildproject.patch
···
··· 1 + diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h 2 + --- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400 3 + +++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400 4 + @@ -148,7 +148,7 @@ 5 + TOP_TO_BOTTOM, 6 + BOTTOM_TO_TOP 7 + }; 8 + - 9 + +public: 10 + struct BuildProject 11 + { 12 + int posX; 13 + @@ -158,7 +158,7 @@ 14 + int unitWorking; 15 + int unitWorkingFuture; 16 + }; 17 + - 18 + +private: 19 + ///Initiates Game 20 + void init(GameGUI *gui, MapEdit* edit); 21 +