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

cmake: add cf-private on darwin

Browse Source
This commit is contained in:
Daiderd Jordan 2019-02-24 11:29:07 +01:00
parent fa82915e01
commit cb8e6f73f5
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -2,7 +2,7 @@
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages , buildPackages
# darwin attributes # darwin attributes
, ps , cf-private, ps
, isBootstrap ? false , isBootstrap ? false
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
, useNcurses ? false, ncurses , useNcurses ? false, ncurses
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ setupHook pkgconfig ] [ setupHook pkgconfig ]
++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ optional useNcurses ncurses ++ optional useNcurses ncurses
++ optional useQt4 qt4 ++ optional useQt4 qt4

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

@ -8496,7 +8496,9 @@ in
cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; 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; }; cmakeCurses = cmake.override { useNcurses = true; };