diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 17d69404e0c..1cd73a8814c 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 00000000000..b645c64a09e --- /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)