diff options
| author | Ji-Haeng Huh <jhhuh.note@gmail.com> | 2016-10-05 01:27:47 +0200 |
|---|---|---|
| committer | Ji-Haeng Huh <jhhuh.note@gmail.com> | 2016-10-05 01:27:47 +0200 |
| commit | b5b907f3fb76bdde0b95a598bbe4ba71187b37ea (patch) | |
| tree | bce04b1db9a6138454faa59d42ed8b8f80319a43 /pkgs/development | |
| parent | f02f1a490be0f0d462020ac1517b68a507a9e9e7 (diff) | |
| download | nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.tar nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.tar.gz nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.tar.bz2 nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.tar.lz nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.tar.xz nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.tar.zst nixlib-b5b907f3fb76bdde0b95a598bbe4ba71187b37ea.zip | |
corretions for PR comments
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/misc/lsof/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 0095f85c3c7a..c1ffece5a793 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 <nixpkgs> {}; -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 |