diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-21 23:38:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 23:38:21 +0100 |
| commit | e90d6c591e3bf94f75b51945a078eab12732234a (patch) | |
| tree | b5fc2e0f59c07a19fe60feb022100711fe7efea3 | |
| parent | 01743eb8aa55098b0501cf9ffafb87b0be5137ea (diff) | |
| parent | d15ca5b8415167fe17f16872f1bb67bdde2a666d (diff) | |
Merge pull request #295148 from trofi/curl-impersonate-to-gcc-13
curl-impersonate: switch to `gcc-13`, disable blanket `-Werror`
| -rw-r--r-- | pkgs/tools/networking/curl-impersonate/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 070aab8d53f28..f4373e09b0523 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -11,7 +11,10 @@ , python3 , ninja , perl -, autoconf +# autoconf-2.71 fails on problematic configure: +# checking curl version... 7.84.0 +# ./configure: line 6713: syntax error near unexpected token `;;' +, autoconf269 , automake , libtool , darwin @@ -40,6 +43,10 @@ let ./curl-impersonate-0.5.2-fix-shebangs.patch ]; + # Disable blanket -Werror to fix build on `gcc-13` related to minor + # warnings on `boringssl`. + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + strictDeps = true; nativeBuildInputs = lib.optionals stdenv.isDarwin [ @@ -52,7 +59,7 @@ let python3.pkgs.gyp ninja perl - autoconf + autoconf269 automake libtool unzip diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de746faad2192..3c7aa60a14d9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7273,11 +7273,9 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate = - builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) - (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); - curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; - curl-impersonate-chrome = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; + curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; + curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; + curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; |