alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Don't include <malloc.h>, it doesn't exist on all platforms.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10803
This commit is contained in:
Eelco Dolstra 2008-02-21 14:01:19 +00:00
parent 289a6dd48a
commit c9f2559e30
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/text/replace/default.nix
View file

@ -1,6 +1,6 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation ({
name = "replace-2.24"; name = "replace-2.24";
src = fetchurl { src = fetchurl {
@ -16,4 +16,4 @@ stdenv.mkDerivation {
homepage = http://replace.richardlloyd.org.uk/; homepage = http://replace.richardlloyd.org.uk/;
description = "A tool to replace verbatim strings"; description = "A tool to replace verbatim strings";
}; };
} } // (if stdenv.system == "i686-darwin" then {patches = [./malloc.patch];} else {}))

13
pkgs/tools/text/replace/malloc.patch Normal file
View file

@ -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 <ctype.h>
#include <unistd.h>
#include <string.h>
- #include <malloc.h>
#include <sys/stat.h>
#include <ftw.h>
#include <utime.h>
--- 11,16 ----