JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unixtools: replace darwin.ps

Browse Source
This commit is contained in:
Matthew Bauer 2018-03-27 13:02:24 -05:00
parent 00e6cc94ae
commit 11f0e07d4f
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/build-managers/cmake/2.8.nix
View File

@ -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);

9
pkgs/top-level/all-packages.nix
View File

@ -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; };

2
pkgs/top-level/unix-tools.nix
View File

@ -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;