diff options
| author | Artem Leshchev <matshch@avride.ai> | 2024-02-16 13:23:03 +0300 |
|---|---|---|
| committer | Artem Leshchev <matshch@avride.ai> | 2024-02-16 13:23:03 +0300 |
| commit | 1a16930721f513720b1eb70b703e65c42426bc20 (patch) | |
| tree | ca709b0817fc4d9ff3416f8fe6f555eb960c4744 /pkgs/by-name/cm | |
| parent | cc58770a4c6dab0aa59fb3a107b83117d4c276b5 (diff) | |
| download | nixlib-1a16930721f513720b1eb70b703e65c42426bc20.tar nixlib-1a16930721f513720b1eb70b703e65c42426bc20.tar.gz nixlib-1a16930721f513720b1eb70b703e65c42426bc20.tar.bz2 nixlib-1a16930721f513720b1eb70b703e65c42426bc20.tar.lz nixlib-1a16930721f513720b1eb70b703e65c42426bc20.tar.xz nixlib-1a16930721f513720b1eb70b703e65c42426bc20.tar.zst nixlib-1a16930721f513720b1eb70b703e65c42426bc20.zip | |
cmake: fix patch for darwin
The patch was malformed and did not apply before.
Diffstat (limited to 'pkgs/by-name/cm')
| -rw-r--r-- | pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index 5a7b0fdc8168..16bcbbd02fda 100644 --- a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff +++ b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,6 +1,6 @@ -diff -ru cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-patched/Utilities/cmcurl/CMakeLists.txt ---- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 21:01:32 -+++ cmake-3.28.2-patched/Utilities/cmcurl/CMakeLists.txt 2024-01-31 21:20:02 +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) @@ -15,15 +15,15 @@ diff -ru cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-patched/Utili endif() endif() -diff -ru cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-patched/Utilities/cmcurl/lib/curl_setup.h ---- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 21:01:32 -+++ cmake-3.28.2-patched/Utilities/cmcurl/lib/curl_setup.h 2024-01-31 21:20:50 -@@ -255,12 +255,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 +-#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 |