cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "cmake: 3.19.7 -> 3.21.0"

Browse source 
cmake on darwin now depends on the SystemConfiguration framework.
Support for this has not yet been added to our bootstrapping.

We need to decide how to go further. As this is blocking staging-next
it is reverted.

This reverts commit 29bbaa1489.
This commit is contained in:
Frederik Rietdijk 2021-07-30 10:20:18 +02:00
parent 07dbd12b8d
commit bd57a30d1b
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/tools/build-managers/cmake/application-services.patch
View file

@ -1,8 +1,8 @@
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 9a18184fd3..278d146dd1 100644 index 1b6bb00d4c..487114daa8 100644
--- a/Source/CMakeLists.txt --- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt
@@ -933,7 +933,6 @@ endif() @@ -893,7 +893,6 @@ 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")
@ -11,25 +11,27 @@ index 9a18184fd3..278d146dd1 100644
if(WIN32 AND NOT UNIX) if(WIN32 AND NOT UNIX)
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 77403b076a..d5aac95e1e 100644 index a5ce5d18f4..3d6838ce82 100644
--- a/Source/cmGlobalXCodeGenerator.cxx --- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -49,10 +49,6 @@ struct cmLinkImplementation; @@ -43,11 +43,10 @@
struct cmLinkImplementation;
#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
# include <CoreFoundation/CoreFoundation.h> -# define HAVE_APPLICATION_SERVICES
-# if !TARGET_OS_IPHONE -# include <ApplicationServices/ApplicationServices.h>
-# define HAVE_APPLICATION_SERVICES +# include <CoreFoundation/CoreFoundation.h>
-# include <ApplicationServices/ApplicationServices.h>
-# endif
#endif #endif
#if !defined(CMAKE_BOOTSTRAP) #if !defined(CMAKE_BOOTSTRAP)
# include "cmXMLParser.h"
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 79452ffff6..a848731b7e 100644 index bfcaf30bb7..1da540aee5 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt --- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -2013,11 +2013,6 @@ IF(ENABLE_TEST) @@ -2007,11 +2007,6 @@ IF(ENABLE_TEST)
ENDIF(ENABLE_TEST) ENDIF(ENABLE_TEST)
ENDIF() ENDIF()

5
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -16,11 +16,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString isBootstrap "-boot" + lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI" + lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"; + lib.optionalString withQt5 "-qt5UI";
version = "3.21.0"; version = "3.19.7";
src = fetchurl { src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
sha256 = "sha256-SkLVZEmlH004CatNO2H9SpakaeViZuiWzhAJtXaL0qs="; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4=";
}; };
patches = [ patches = [