From db48255b5e76ddd867101bef0e53278632483ce1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 20 Apr 2011 07:06:17 +0000
Subject: Using patch from Globulation2 bugtracker to fix crashes in tutorial

svn path=/nixpkgs/trunk/; revision=26897
---
 pkgs/games/globulation/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index efdf5d47089..2b60abd0092 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net, speex, libvorbis
-  , libogg, boost, fribidi
+  , libogg, boost, fribidi, bsdiff
   , ...}:
 builderDefsPackage
 (a :  
@@ -25,14 +25,25 @@ rec {
     sha256 = sourceInfo.hash;
   };
 
+  tutorial4patch = a.fetchurl {
+    url = "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=34;filename=tutorial-part4.map.bspatch;att=1;bug=595448";
+    name = "globulation2-tutorial4-map-patch-debian.bspatch";
+    sha256 = "d3511ac0f822d512c42abd34b3122f2990862d3d0af6ce464ff372f5bd7f35e9";
+  };
+
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doUnpack" "doPatch" "workaroundScons" "doScons"];
+  phaseNames = ["doUnpack" "doPatch" "doBspatch" "workaroundScons" "doScons"];
 
   patches = [./header-order.patch];
 
+  doBspatch = a.fullDepEntry ''
+    cp campaigns/tutorial-part4.map{,.orig}
+    bspatch  campaigns/tutorial-part4.map{.orig,} ${tutorial4patch}
+  '' ["minInit" "doUnpack" "addInputs"];
+
   # FIXME
   # I officially fail to understand what goes on, but that seems to work
   # too well not to use. Yes, it is ugly, I know...
-- 
cgit 1.4.1