Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62c8f212150f791bf94ff3202bd7c4e2. It breaks evaluation (possibly related to earlier reverts): http://hydra.nixos.org/build/24887643
This commit is contained in:
parent
6769633b64
commit
aba76f23a5
@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
|
|||||||
cp lsof $out/bin
|
cp lsof $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
isBroken = stdenv.isDarwin;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/;
|
homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/;
|
||||||
description = "A tool to list open files";
|
description = "A tool to list open files";
|
||||||
|
@ -78,7 +78,6 @@ let
|
|||||||
Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
|
Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
|
||||||
libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
|
libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
|
||||||
libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
|
libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
|
||||||
lsof = applePackage "lsof" "53" "0ylzds2rhq5v8rddh0dgpcndsp9n3slfp30wsbl5fmsch7a5356j" {};
|
|
||||||
mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
|
mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
|
||||||
objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
|
objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
|
||||||
objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
|
objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
{ stdenv, appleDerivation, ncurses }:
|
|
||||||
|
|
||||||
appleDerivation {
|
|
||||||
buildInputs = [ ncurses ];
|
|
||||||
|
|
||||||
postUnpack = ''
|
|
||||||
sourceRoot="$sourceRoot/lsof"
|
|
||||||
'';
|
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
mv Configure configure
|
|
||||||
substituteInPlace configure \
|
|
||||||
--replace '`which make`' "$(type -P make)" \
|
|
||||||
--replace /usr/include "${stdenv.libc}/include" \
|
|
||||||
--replace -lcurses -lncurses
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontAddPrefix = true;
|
|
||||||
|
|
||||||
configureFlags = [ "-n" "darwin" ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin $out/man/man8
|
|
||||||
cp lsof.8 $out/man/man8/
|
|
||||||
cp lsof $out/bin
|
|
||||||
'';
|
|
||||||
}
|
|
@ -5635,9 +5635,7 @@ let
|
|||||||
|
|
||||||
libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
|
libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
|
||||||
|
|
||||||
lsof = if stdenv.isDarwin
|
lsof = callPackage ../development/tools/misc/lsof { };
|
||||||
then darwin.lsof
|
|
||||||
else callPackage ../development/tools/misc/lsof { };
|
|
||||||
|
|
||||||
ltrace = callPackage ../development/tools/misc/ltrace { };
|
ltrace = callPackage ../development/tools/misc/ltrace { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user