diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-02 23:56:50 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:49 -0400 |
| commit | eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3 (patch) | |
| tree | 4030f2605ab8330aff3c46b47e4b63abf68679db /pkgs/development/tools | |
| parent | 037f62bbadb96c3587054613a9f107e34f6011c9 (diff) | |
| download | nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.tar nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.tar.gz nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.tar.bz2 nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.tar.lz nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.tar.xz nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.tar.zst nixlib-eaadbdf1c3e4c2350bad0077593b6b90bfb1c0d3.zip | |
cmake: don’t use cf-private
cf-private is not necessary here. cmake just needs the CoreFoundation framework to be used. swift-corefoundation seems to work fine in this case. /cc @lnl7
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/application-services.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index 78077f9eaa52..2107dcdfbc66 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -2,16 +2,16 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 8aff8f6..af1852d 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt -@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" +@@ -791,12 +791,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" endif() endif() --# On Apple we need CoreFoundation and CoreServices --if(APPLE) -- target_link_libraries(CMakeLib "-framework CoreFoundation") + # On Apple we need CoreFoundation and CoreServices + if(APPLE) + target_link_libraries(CMakeLib "-framework CoreFoundation") - target_link_libraries(CMakeLib "-framework CoreServices") --endif() -- + endif() + if(WIN32 AND NOT UNIX) # We need the rpcrt4 library on Windows. # We need the crypt32 library on Windows for crypto/cert APIs. diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 54fe8e4af5a0..721015f0c7c4 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 -, cf-private, ps +, ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses @@ -52,7 +52,6 @@ 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 |