public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnu grep does not need the patch we set anymore.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24186
This commit is contained in:
Lluís Batlle i Rossell 2010-10-08 14:28:48 +00:00
parent c93a74426b
commit 143ea0f491
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/text/gnugrep/default.nix
View File

@ -5,8 +5,6 @@ let version = "2.7"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnugrep-${version}"; name = "gnugrep-${version}";
patches = [ ./malloc.patch ];
src = fetchurl { src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.gz"; url = "mirror://gnu/grep/grep-${version}.tar.gz";
sha256 = "1b8vksfd1ngharac3ygaqim3lrf0yqap992sg0vfm7572l88655d"; sha256 = "1b8vksfd1ngharac3ygaqim3lrf0yqap992sg0vfm7572l88655d";

15
pkgs/tools/text/gnugrep/malloc.patch
View File

@ -1,15 +0,0 @@
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)