A little patch to gav, and it does not require gcc 4.1 anymore.
svn path=/nixpkgs/trunk/; revision=32863
This commit is contained in:
parent
65f45ef322
commit
18ddc5f25c
|
@ -8,11 +8,13 @@ stdenv.mkDerivation {
|
|||
sha256 = "8f0deb8b2cd775b339229054f4f282583a4cfbcba9d27a6213cf910bab944f3e";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
prePatch = ''
|
||||
mkdir -p $out/bin
|
||||
sed -e "s@/usr@$out@" -i Makefile
|
||||
sed -e "s@/usr@$out@" -i Theme.h
|
||||
'';
|
||||
|
||||
patches = [ ./gcc.patch ];
|
||||
buildInputs = [SDL SDL_image SDL_mixer SDL_net];
|
||||
|
||||
meta = {
|
||||
|
|
12
pkgs/games/gav/gcc.patch
Normal file
12
pkgs/games/gav/gcc.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff --git a/aarg.h b/aarg.h
|
||||
index a212870..907671c 100644
|
||||
--- a/aarg.h
|
||||
+++ b/aarg.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
+#include <string.h>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <sstream>
|
|
@ -3471,9 +3471,7 @@ let
|
|||
|
||||
gamin = callPackage ../development/libraries/gamin { };
|
||||
|
||||
gav = callPackage ../games/gav {
|
||||
stdenv = overrideGCC stdenv gcc41;
|
||||
};
|
||||
gav = callPackage ../games/gav { };
|
||||
|
||||
gdome2 = callPackage ../development/libraries/gdome2 {
|
||||
inherit (gnome) gtkdoc;
|
||||
|
|
Loading…
Reference in a new issue