Author: raskin
Date: Wed Apr 20 07:06:17 2011
New Revision: 26897
URL: https://svn.nixos.org/websvn/nix/?rev=26897&sc=1
Log:
Using patch from Globulation2 bugtracker to fix crashes in tutorial
Modified:
nixpkgs/trunk/pkgs/games/globulation/default.nix
Modified: nixpkgs/trunk/pkgs/games/globulation/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/globulation/default.nix Tue Apr 19 20:51:40
2011 (r26896)
+++ nixpkgs/trunk/pkgs/games/globulation/default.nix Wed Apr 20 07:06:17
2011 (r26897)
@@ -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 @@
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...
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
