public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using patch from Globulation2 bugtracker to fix crashes in tutorial

Browse Source 
svn path=/nixpkgs/trunk/; revision=26897
This commit is contained in:
Michael Raskin 2011-04-20 07:06:17 +00:00
parent 167912d19e
commit db48255b5e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
x@{builderDefsPackage x@{builderDefsPackage
, mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net, speex, libvorbis , mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net, speex, libvorbis
, libogg, boost, fribidi , libogg, boost, fribidi, bsdiff
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
@ -25,14 +25,25 @@ rec {
sha256 = sourceInfo.hash; 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 (sourceInfo) name version;
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doUnpack" "doPatch" "workaroundScons" "doScons"]; phaseNames = ["doUnpack" "doPatch" "doBspatch" "workaroundScons" "doScons"];
patches = [./header-order.patch]; patches = [./header-order.patch];
doBspatch = a.fullDepEntry ''
cp campaigns/tutorial-part4.map{,.orig}
bspatch campaigns/tutorial-part4.map{.orig,} ${tutorial4patch}
'' ["minInit" "doUnpack" "addInputs"];
# FIXME # FIXME
# I officially fail to understand what goes on, but that seems to work # I officially fail to understand what goes on, but that seems to work
# too well not to use. Yes, it is ugly, I know... # too well not to use. Yes, it is ugly, I know...