lol

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

+1 -33
-2
pkgs/development/tools/misc/lsof/default.nix
··· 27 27 cp lsof $out/bin 28 28 ''; 29 29 30 - isBroken = stdenv.isDarwin; 31 - 32 30 meta = { 33 31 homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/; 34 32 description = "A tool to list open files";
-1
pkgs/os-specific/darwin/apple-source-releases/default.nix
··· 78 78 Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; 79 79 libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; 80 80 libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; 81 - lsof = applePackage "lsof" "53" "0ylzds2rhq5v8rddh0dgpcndsp9n3slfp30wsbl5fmsch7a5356j" {}; 82 81 mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {}; 83 82 objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; 84 83 objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
-27
pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix
··· 1 - { stdenv, appleDerivation, ncurses }: 2 - 3 - appleDerivation { 4 - buildInputs = [ ncurses ]; 5 - 6 - postUnpack = '' 7 - sourceRoot="$sourceRoot/lsof" 8 - ''; 9 - 10 - prePatch = '' 11 - mv Configure configure 12 - substituteInPlace configure \ 13 - --replace '`which make`' "$(type -P make)" \ 14 - --replace /usr/include "${stdenv.libc}/include" \ 15 - --replace -lcurses -lncurses 16 - ''; 17 - 18 - dontAddPrefix = true; 19 - 20 - configureFlags = [ "-n" "darwin" ]; 21 - 22 - installPhase = '' 23 - mkdir -p $out/bin $out/man/man8 24 - cp lsof.8 $out/man/man8/ 25 - cp lsof $out/bin 26 - ''; 27 - }
+1 -3
pkgs/top-level/all-packages.nix
··· 5635 5635 5636 5636 libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; 5637 5637 5638 - lsof = if stdenv.isDarwin 5639 - then darwin.lsof 5640 - else callPackage ../development/tools/misc/lsof { }; 5638 + lsof = callPackage ../development/tools/misc/lsof { }; 5641 5639 5642 5640 ltrace = callPackage ../development/tools/misc/ltrace { }; 5643 5641