diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-04-20 07:06:17 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-04-20 07:06:17 +0000 |
| commit | db48255b5e76ddd867101bef0e53278632483ce1 (patch) | |
| tree | 0ea968d0f1ae1ab94958b8915c7885e1749b4db2 /pkgs/games/globulation | |
| parent | 167912d19efa7ac32ad791d5740eb631c2fd376f (diff) | |
| download | nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.tar nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.tar.gz nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.tar.bz2 nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.tar.lz nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.tar.xz nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.tar.zst nixpkgs-db48255b5e76ddd867101bef0e53278632483ce1.zip | |
Using patch from Globulation2 bugtracker to fix crashes in tutorial
svn path=/nixpkgs/trunk/; revision=26897
Diffstat (limited to 'pkgs/games/globulation')
| -rw-r--r-- | pkgs/games/globulation/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
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... |