From 18ddc5f25ced4b20b7668964a072e0f0f4d37fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 7 Mar 2012 22:04:53 +0000
Subject: [PATCH] A little patch to gav, and it does not require gcc 4.1
 anymore.

svn path=/nixpkgs/trunk/; revision=32863
---
 pkgs/games/gav/default.nix      |  4 +++-
 pkgs/games/gav/gcc.patch        | 12 ++++++++++++
 pkgs/top-level/all-packages.nix |  4 +---
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/games/gav/gcc.patch

diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix
index d525e0a372f9..d83358cd69d7 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 000000000000..eb4c64727bce
--- /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>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6f33a39bb48..9325401e5c65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;