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

cmake: don’t use cf-private

Browse Source 
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
This commit is contained in:
Matthew Bauer 2019-03-02 23:56:50 -05:00
parent 037f62bbad
commit eaadbdf1c3
3 changed files with 8 additions and 11 deletions
pkgs
development/tools/build-managers/cmake
application-services.patchdefault.nix
top-level
all-packages.nix

12
pkgs/development/tools/build-managers/cmake/application-services.patch
View File

@ -2,16 +2,16 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 8aff8f6..af1852d 100644 index 8aff8f6..af1852d 100644
--- a/Source/CMakeLists.txt --- a/Source/CMakeLists.txt
+++ b/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()
endif() endif()
-# On Apple we need CoreFoundation and CoreServices # On Apple we need CoreFoundation and CoreServices
-if(APPLE) if(APPLE)
- target_link_libraries(CMakeLib "-framework CoreFoundation") target_link_libraries(CMakeLib "-framework CoreFoundation")
- target_link_libraries(CMakeLib "-framework CoreServices") - target_link_libraries(CMakeLib "-framework CoreServices")
-endif() endif()
-
if(WIN32 AND NOT UNIX) if(WIN32 AND NOT UNIX)
# We need the rpcrt4 library on Windows. # We need the rpcrt4 library on Windows.
# We need the crypt32 library on Windows for crypto/cert APIs. # We need the crypt32 library on Windows for crypto/cert APIs.

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
, cf-private, ps , ps
, isBootstrap ? false , isBootstrap ? false
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
, useNcurses ? false, ncurses , useNcurses ? false, ncurses
@ -52,7 +52,6 @@ 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

@ -8758,9 +8758,7 @@ 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; };