diff options
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/2.8.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index fcf06782e4dd..c87fe1cc5ace 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +, useNcurses ? false, ncurses, useQt4 ? false, qt4 , buildPlatform, hostPlatform }: with stdenv.lib; -assert wantPS -> (ps != null); assert stdenv ? cc; assert stdenv.cc ? libc; @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { ++ optional useNcurses ncurses ++ optional useQt4 qt4; - propagatedBuildInputs = optional wantPS ps; + propagatedBuildInputs = [ ps ]; CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7e581eff7ed..961b6cdfe171 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7620,14 +7620,9 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; - cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { - wantPS = stdenv.isDarwin; - inherit (darwin) ps; - }; + cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { - inherit (darwin) ps; - }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; cmakeCurses = cmake.override { useNcurses = true; }; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 0c6b9e261dd8..ab807290b7c1 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -82,7 +82,7 @@ in rec { }; ps = singleBinary "ps" { linux = pkgs.procps; - darwin = pkgs.darwin.adv_cmds; + darwin = pkgs.darwin.ps; }; route = singleBinary "route" { linux = pkgs.nettools; |