From c9f2559e30c07065d727a9be6e65eaa53a4e85d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Feb 2008 14:01:19 +0000 Subject: [PATCH] * Don't include , it doesn't exist on all platforms. svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10803 --- pkgs/tools/text/replace/default.nix | 4 ++-- pkgs/tools/text/replace/malloc.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/text/replace/malloc.patch diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index ca96309e40ed..85e2fe2caca3 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "replace-2.24"; src = fetchurl { @@ -16,4 +16,4 @@ stdenv.mkDerivation { homepage = http://replace.richardlloyd.org.uk/; description = "A tool to replace verbatim strings"; }; -} +} // (if stdenv.system == "i686-darwin" then {patches = [./malloc.patch];} else {})) diff --git a/pkgs/tools/text/replace/malloc.patch b/pkgs/tools/text/replace/malloc.patch new file mode 100644 index 000000000000..1ee95c4bae18 --- /dev/null +++ b/pkgs/tools/text/replace/malloc.patch @@ -0,0 +1,13 @@ +diff -rc replace-2.24-orig/replace.h replace-2.24/replace.h +*** replace-2.24-orig/replace.h 2004-10-07 15:15:06.000000000 +0200 +--- replace-2.24/replace.h 2008-02-21 14:57:47.000000000 +0100 +*************** +*** 11,17 **** + #include + #include + #include +- #include + #include + #include + #include +--- 11,16 ----