diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-02-24 11:29:07 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-02-24 11:32:47 +0100 |
| commit | cb8e6f73f51b493919ae8034e23fc8c7b073447a (patch) | |
| tree | 83dab48be85e44866b23b9c2a52fe8d4de3a975b | |
| parent | fa82915e01c1c06ca9f640217bebbda29420499f (diff) | |
| download | nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.tar nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.tar.gz nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.tar.bz2 nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.tar.lz nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.tar.xz nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.tar.zst nixpkgs-cb8e6f73f51b493919ae8034e23fc8c7b073447a.zip | |
cmake: add cf-private on darwin
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 721015f0c7c..54fe8e4af5a 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -2,7 +2,7 @@ , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes -, ps +, cf-private, ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] + ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbbed4edf57..4444d39bce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8496,7 +8496,9 @@ in cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { + inherit (darwin) cf-private; + }; cmakeCurses = cmake.override { useNcurses = true; }; |