Commit d15ca5b8 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

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

While at it fixed build failure against `autoconf-2.71` by downgrading
to `2.69`.
parent 1809887d

pkgs/tools/networking/curl-impersonate/default.nix

+9 −2
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+3 −5
Original line number Diff line number Diff line
@@ -7283,11 +7283,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 { };