Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

cmake: backport curl 8.16 compatibility fix (#425701)

Browse Source
This commit is contained in:
Vladimír Čunát
2025-09-19 08:32:49 +02:00
parent c66594c44f 63dbf8ee09
commit 6ef1f26512
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
index 7836f4b9c78a1d103eee515d618856a6712b4480..9113890b5a12cb157b691b66d96e25d0fd4b50ef 100644
--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@@ -52,7 +52,7 @@ private:
std::vector<std::string> HttpHeaders;
std::string HTTPProxyAuth;
std::string HTTPProxy;
- curl_proxytype HTTPProxyType;
+ long HTTPProxyType;
bool UseHttp10 = false;
bool Quiet = false;
int TimeOutSeconds = 0;

3
pkgs/by-name/cm/cmake/package.nix
View File

@@ -75,6 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
# Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900
# Needed to correctly link curl in pkgsStatic.
./008-FindCURL-Add-more-target-properties-from-pkg-config.diff
# Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134
# Fixes build against curl 8.16 and later
./009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff
];
outputs = [