From 2954596106c5d6e96c9f121573a05baf4bc8630d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 1 Aug 2010 21:17:29 +0000
Subject: [PATCH] Making gnugrep cross-build for mips

svn path=/nixpkgs/branches/stdenv-updates/; revision=22847
---
 pkgs/tools/text/gnugrep/default.nix  |  2 ++
 pkgs/tools/text/gnugrep/malloc.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/text/gnugrep/malloc.patch

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 17d69404e0c7..1cd73a8814ce 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -5,6 +5,8 @@ let version = "2.6.3"; in
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
   
+  patches = [ ./malloc.patch ];
+  
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.gz";
     sha256 = "0rnnljzcpb2sl5zabww7gbzk9r6kp8kycsqrf909d6jdak8yah53";
diff --git a/pkgs/tools/text/gnugrep/malloc.patch b/pkgs/tools/text/gnugrep/malloc.patch
new file mode 100644
index 000000000000..b645c64a09e1
--- /dev/null
+++ b/pkgs/tools/text/gnugrep/malloc.patch
@@ -0,0 +1,15 @@
+http://www.mail-archive.com/bug-grep@gnu.org/msg02537.html
+
+diff --git a/src/kwset.c b/src/kwset.c
+index 050562e..995be79 100644
+--- a/src/kwset.c
++++ b/src/kwset.c
+@@ -40,7 +40,7 @@
+ #ifdef GREP
+ # include "xalloc.h"
+ # undef malloc
+-# define malloc(s) xmalloc(s)
++# define malloc xmalloc
+ #endif
+
+ #define NCHAR (UCHAR_MAX + 1)