lol

Merge pull request #295148 from trofi/curl-impersonate-to-gcc-13

curl-impersonate: switch to `gcc-13`, disable blanket `-Werror`

authored by

Weijia Wang and committed by
GitHub
e90d6c59 01743eb8

+12 -7
+9 -2
pkgs/tools/networking/curl-impersonate/default.nix
··· 11 11 , python3 12 12 , ninja 13 13 , perl 14 - , autoconf 14 + # autoconf-2.71 fails on problematic configure: 15 + # checking curl version... 7.84.0 16 + # ./configure: line 6713: syntax error near unexpected token `;;' 17 + , autoconf269 15 18 , automake 16 19 , libtool 17 20 , darwin ··· 40 43 ./curl-impersonate-0.5.2-fix-shebangs.patch 41 44 ]; 42 45 46 + # Disable blanket -Werror to fix build on `gcc-13` related to minor 47 + # warnings on `boringssl`. 48 + env.NIX_CFLAGS_COMPILE = "-Wno-error"; 49 + 43 50 strictDeps = true; 44 51 45 52 nativeBuildInputs = lib.optionals stdenv.isDarwin [ ··· 52 59 python3.pkgs.gyp 53 60 ninja 54 61 perl 55 - autoconf 62 + autoconf269 56 63 automake 57 64 libtool 58 65 unzip
+3 -5
pkgs/top-level/all-packages.nix
··· 7273 7273 7274 7274 curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; 7275 7275 7276 - curl-impersonate = 7277 - builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) 7278 - (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); 7279 - curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; 7280 - curl-impersonate-chrome = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; 7276 + curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; 7277 + curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; 7278 + curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome; 7281 7279 7282 7280 curlie = callPackage ../tools/networking/curlie { }; 7283 7281