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

cmake: remove obsolete Darwin patches

Browse Source 
These no longer apply and shouldn’t be necessary with the new
SDK pattern.
This commit is contained in:
Emily
2025-01-06 20:11:41 +00:00
parent 9e51fd8b02
commit a3d56f6501
2 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff
-35
View File
@@ -1,35 +0,0 @@
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index b766aee425..ad50e64ce6 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -466,13 +466,6 @@ if(ENABLE_IPV6 AND NOT WIN32)
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)
set(use_core_foundation_and_core_services ON)
-
- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
- if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
- message(FATAL_ERROR "SystemConfiguration framework not found")
- endif()
-
- list(APPEND CURL_LIBS "-framework SystemConfiguration")
endif()
endif()
if(ENABLE_IPV6)
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h
index f7ba7e92a5..e4663cbf36 100644
--- a/Utilities/cmcurl/lib/curl_setup.h
+++ b/Utilities/cmcurl/lib/curl_setup.h
@@ -316,12 +316,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 TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
- defined(USE_IPV6)
-# define CURL_MACOS_CALL_COPYPROXIES 1
-# endif
#endif
#ifdef USE_LWIPSOCK
pkgs/by-name/cm/cmake/package.nix
+3 -1
View File
@@ -61,6 +61,9 @@ stdenv.mkDerivation (finalAttrs: {
./000-nixpkgs-cmake-prefix-path.diff
# Don't search in non-Nix locations such as /usr, but do search in our libc.
./001-search-path.diff
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
# TODO: Remove these in `staging`.
# Don't depend on frameworks.
./002-application-services.diff
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
@@ -68,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff
# Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51
++ lib.optional (stdenv.hostPlatform.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff
# On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
# On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.