From b5b907f3fb76bdde0b95a598bbe4ba71187b37ea Mon Sep 17 00:00:00 2001 From: Ji-Haeng Huh Date: Wed, 5 Oct 2016 01:27:47 +0200 Subject: [PATCH] corretions for PR comments --- pkgs/development/tools/misc/lsof/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 0095f85c3c7..c1ffece5a79 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl }: -let pkgs = import {}; -in +{ stdenv, fetchurl, ncurses }: + stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; - buildInputs = [ pkgs.ncurses ]; + buildInputs = [ ncurses ]; src = fetchurl { urls = @@ -25,16 +24,19 @@ stdenv.mkDerivation rec { }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - + patches = [ ./dfile.patch ]; - preBuild = "sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e s/-lcurses/-lncurses/ ;"; - configurePhase = '' # Stop build scripts from searching global include paths - # export LSOF_INCLUDE=/$(md5sum <(echo $name) | awk '{print $1}') + export LSOF_INCLUDE=${stdenv.libc}/include ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"} ''; + + preBuild = '' + sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' + ''; + installPhase = '' mkdir -p $out/bin $out/man/man8