From aba76f23a5b1c6549aa1d424be6a82e4df6ca7d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Aug 2015 12:05:06 +0200 Subject: 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 --- .../darwin/apple-source-releases/default.nix | 1 - .../darwin/apple-source-releases/lsof/default.nix | 27 ---------------------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix (limited to 'pkgs/os-specific/darwin') diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index e53637ee148b..f29a2b5b9111 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -78,7 +78,6 @@ let Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; - lsof = applePackage "lsof" "53" "0ylzds2rhq5v8rddh0dgpcndsp9n3slfp30wsbl5fmsch7a5356j" {}; mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {}; objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix b/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix deleted file mode 100644 index 23506f5c2175..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix +++ /dev/null @@ -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 - ''; -} -- cgit 1.4.1