diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-01-29 17:32:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-29 17:32:55 +0000 |
commit | 71fa504cf9411a99ee8364c996ba9f59fdbd0e05 (patch) | |
tree | 62c791b2990376b3700c022f9297ecc72b058d79 /pkgs | |
parent | 96f242b8a742898aeb30e529154eac10d3864336 (diff) | |
parent | 06a945f01789a319f8109103c0a90c2aa7ef058b (diff) | |
download | nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.tar nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.tar.gz nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.tar.bz2 nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.tar.lz nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.tar.xz nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.tar.zst nixlib-71fa504cf9411a99ee8364c996ba9f59fdbd0e05.zip |
Merge pull request #22217 from adnelson/lsof_darwin_fix
lsof: replace impure reference to /usr/include files
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/lsof/default.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 37e5ae6f7105..774734a895c4 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, ncurses }: +let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in + stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; @@ -24,20 +26,19 @@ stdenv.mkDerivation rec { }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - + patches = [ ./dfile.patch ]; - configurePhase = '' - # Stop build scripts from searching global include paths - export LSOF_INCLUDE=${stdenv.cc.libc}/include - ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"} - ''; - + # Stop build scripts from searching global include paths + LSOF_INCLUDE = "${stdenv.cc.libc}/include"; + configurePhase = "./Configure -n ${dialect}"; preBuild = '' sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' + for filepath in $(find dialects/${dialect} -type f); do + sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath + done ''; - installPhase = '' mkdir -p $out/bin $out/man/man8 cp lsof.8 $out/man/man8/ @@ -53,6 +54,6 @@ stdenv.mkDerivation rec { from it). ''; maintainers = [ stdenv.lib.maintainers.mornfall ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } |