diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-13 22:08:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-13 22:08:54 +0100 |
| commit | cc2cfef672791bb951896244972f74d8529b17ff (patch) | |
| tree | 3b7231270631f27900147d04d9dc3416c809fef3 /pkgs/by-name/fr | |
| parent | 54eaf4d9a03ebf1e03f581569adac1a6867fa9aa (diff) | |
| parent | 277a870cf19dbbc37846528583f26007b55699ac (diff) | |
Merge pull request #288071 from wegank/freefilesync-curl
freefilesync: fix build with curl 8.6.0
Diffstat (limited to 'pkgs/by-name/fr')
| -rw-r--r-- | pkgs/by-name/fr/freefilesync/curl-8.6.0.patch | 16 | ||||
| -rw-r--r-- | pkgs/by-name/fr/freefilesync/package.nix | 2 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch b/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch new file mode 100644 index 0000000000000..60004b3f1ba68 --- /dev/null +++ b/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch @@ -0,0 +1,16 @@ +diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp +index 11ac9dd..93edd44 100644 +--- a/libcurl/curl_wrap.cpp ++++ b/libcurl/curl_wrap.cpp +@@ -401,9 +401,10 @@ std::wstring zen::formatCurlStatusCode(CURLcode sc) + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL); ++ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE); + ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); + } +- static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1); ++ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); + + return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); + } diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index ec93d9badec6b..73a00b8159871 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: { patch = "ffs_no_check_updates.patch"; hash = "sha256-lPyHpxhZz8BSnDI8QfAzKpKwVkp2jiF49RWjKNuZGII="; }) + # Fix build with curl 8.6.0 + ./curl-8.6.0.patch ]; nativeBuildInputs = [ |