diff options
Diffstat (limited to 'nixpkgs/pkgs/by-name/cm/cmake')
| -rw-r--r-- | nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff | 63 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/cm/cmake/package.nix | 7 |
2 files changed, 17 insertions, 53 deletions
diff --git a/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff b/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index ffd3077d301e..16bcbbd02fda 100644 --- a/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff +++ b/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,10 +1,10 @@ -diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt ---- cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt 2023-10-06 10:08:35.000000000 -0300 -+++ cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt 2023-10-22 21:51:09.231609901 -0300 -@@ -414,13 +414,6 @@ +diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt +--- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 23:01:32.000000000 +0300 ++++ cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt 2024-02-16 13:09:40.805479195 +0300 +@@ -470,13 +470,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) - set(use_core_foundation ON) + set(use_core_foundation_and_core_services ON) - - find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") - if(NOT SYSTEMCONFIGURATION_FRAMEWORK) @@ -15,56 +15,19 @@ diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utiliti endif() endif() -diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h ---- cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h 2023-10-06 10:08:35.000000000 -0300 -+++ cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h 2023-10-22 21:52:00.214748294 -0300 -@@ -260,11 +260,7 @@ +diff -Naur cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h +--- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 23:01:32.000000000 +0300 ++++ cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h 2024-02-16 13:10:38.822445566 +0300 +@@ -255,12 +255,6 @@ * performing this task will result in a synthesized IPv6 address. */ #if defined(__APPLE__) && !defined(USE_ARES) -#include <TargetConditionals.h> - #define USE_RESOLVE_ON_IPS 1 --# if defined(TARGET_OS_OSX) && TARGET_OS_OSX --# define CURL_OSX_CALL_COPYPROXIES 1 +-#define USE_RESOLVE_ON_IPS 1 +-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ +- defined(ENABLE_IPV6) +-# define CURL_MACOS_CALL_COPYPROXIES 1 -# endif #endif #ifdef USE_LWIPSOCK -diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/hostip.c cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c ---- cmake-3.27.7/Utilities/cmcurl/lib/hostip.c 2023-10-06 10:08:35.000000000 -0300 -+++ cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c 2023-10-22 21:53:29.249989934 -0300 -@@ -67,10 +67,6 @@ - #include "curl_memory.h" - #include "memdebug.h" - --#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) --#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> --#endif -- - #if defined(CURLRES_SYNCH) && \ - defined(HAVE_ALARM) && \ - defined(SIGALRM) && \ -@@ -743,23 +739,6 @@ - return CURLRESOLV_ERROR; - } - --#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) -- { -- /* -- * The automagic conversion from IPv4 literals to IPv6 literals only -- * works if the SCDynamicStoreCopyProxies system function gets called -- * first. As Curl currently doesn't support system-wide HTTP proxies, we -- * therefore don't use any value this function might return. -- * -- * This function is only available on a macOS and is not needed for -- * IPv4-only builds, hence the conditions above. -- */ -- CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL); -- if(dict) -- CFRelease(dict); -- } --#endif -- - #ifndef USE_RESOLVE_ON_IPS - /* First check if this is an IPv4 address string */ - if(Curl_inet_pton(AF_INET, hostname, &in) > 0) diff --git a/nixpkgs/pkgs/by-name/cm/cmake/package.nix b/nixpkgs/pkgs/by-name/cm/cmake/package.nix index 42dbacac67b9..07161b65b076 100644 --- a/nixpkgs/pkgs/by-name/cm/cmake/package.nix +++ b/nixpkgs/pkgs/by-name/cm/cmake/package.nix @@ -32,7 +32,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; @@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.27.9"; + version = "3.28.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-YJqbmFcqal6kd/kSz/uXMQntTQpqaz+eI1PSzcBIcI4="; + hash = "sha256-FGb4ctwcIm83PPj7pCMO0hao8Qi9VLR3tczf2eotEko="; }; patches = [ @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase + ++ lib.optional stdenv.isDarwin CoreServices ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; |