nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-08 17:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9514 from dfoxfranke/glob2

Browse Source 
glob2: fix build failure
This commit is contained in:
Domen Kožar 2015-08-29 14:05:48 +02:00
commit 0c8b638b57
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
}; };
patches = [ ./header-order.patch ]; patches = [ ./header-order.patch ./public-buildproject.patch ];
postPatch = '' postPatch = ''
cp campaigns/tutorial-part4.map{,.orig} cp campaigns/tutorial-part4.map{,.orig}

21
pkgs/games/globulation/public-buildproject.patch Normal file
View File

@ -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);