Author: viric
Date: Sun Aug 1 21:17:29 2010
New Revision: 22847
URL: https://svn.nixos.org/websvn/nix/?rev=22847&sc=1
Log:
Making gnugrep cross-build for mips
Added:
nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/malloc.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix Sun Aug
1 21:06:45 2010 (r22846)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/default.nix Sun Aug
1 21:17:29 2010 (r22847)
@@ -5,6 +5,8 @@
stdenv.mkDerivation {
name = "gnugrep-${version}";
+ patches = [ ./malloc.patch ];
+
src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.gz";
sha256 = "0rnnljzcpb2sl5zabww7gbzk9r6kp8kycsqrf909d6jdak8yah53";
Added: nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/malloc.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/text/gnugrep/malloc.patch
Sun Aug 1 21:17:29 2010 (r22847)
@@ -0,0 +1,15 @@
+http://www.mail-archive.com/[email protected]/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)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
