diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-08 14:28:48 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-08 14:28:48 +0000 |
| commit | 143ea0f4913d49c0705a9856907a5c7694fe1311 (patch) | |
| tree | 3c0f2d3fba728ef84a1eaf54610f51213b78d4fb /pkgs/tools/text/gnugrep | |
| parent | c93a74426b3bd78795d4fc9a9000361971293fa1 (diff) | |
| download | nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.tar nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.tar.gz nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.tar.bz2 nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.tar.lz nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.tar.xz nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.tar.zst nixpkgs-143ea0f4913d49c0705a9856907a5c7694fe1311.zip | |
gnu grep does not need the patch we set anymore.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24186
Diffstat (limited to 'pkgs/tools/text/gnugrep')
| -rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gnugrep/malloc.patch | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 18a6ef5dc69..3c21bfd2f25 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -5,8 +5,6 @@ let version = "2.7"; in stdenv.mkDerivation { name = "gnugrep-${version}"; - patches = [ ./malloc.patch ]; - src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.gz"; sha256 = "1b8vksfd1ngharac3ygaqim3lrf0yqap992sg0vfm7572l88655d"; diff --git a/pkgs/tools/text/gnugrep/malloc.patch b/pkgs/tools/text/gnugrep/malloc.patch deleted file mode 100644 index b645c64a09e..00000000000 --- a/pkgs/tools/text/gnugrep/malloc.patch +++ /dev/null @@ -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) |