diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-07 22:04:53 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-07 22:04:53 +0000 |
| commit | 18ddc5f25ced4b20b7668964a072e0f0f4d37fb1 (patch) | |
| tree | 47990aa7129252d0237bb06b16cf3a4e60c70e64 /pkgs/games/gav | |
| parent | 65f45ef322bc2897c303e78c33964e5b74808fa3 (diff) | |
| download | nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.tar nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.tar.gz nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.tar.bz2 nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.tar.lz nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.tar.xz nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.tar.zst nixpkgs-18ddc5f25ced4b20b7668964a072e0f0f4d37fb1.zip | |
A little patch to gav, and it does not require gcc 4.1 anymore.
svn path=/nixpkgs/trunk/; revision=32863
Diffstat (limited to 'pkgs/games/gav')
| -rw-r--r-- | pkgs/games/gav/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/gav/gcc.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index d525e0a372f..d83358cd69d 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -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 = { diff --git a/pkgs/games/gav/gcc.patch b/pkgs/games/gav/gcc.patch new file mode 100644 index 00000000000..eb4c64727bc --- /dev/null +++ b/pkgs/games/gav/gcc.patch @@ -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> |