Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
./build.sh
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
export DUB=$NIX_BUILD_TOP/source/bin/dub
|
||||
|
||||
Reference in New Issue
Block a user