From 996b4ebc08e567e51af2116d8aa86c4069256fe6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 29 Jan 2024 18:12:56 +0100 Subject: [PATCH] curl: build with public suffix list support And make sure we pass `--without-libpsl` when it is disabled. https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/ --- pkgs/tools/networking/curl/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d7d78cea11b7..db386df9b068 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature rtmpSupport "librtmp") (lib.withFeature rustlsSupport "rustls") (lib.withFeature zstdSupport "zstd") + (lib.withFeature pslSupport "libpsl") (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli)) (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84bb3a5ac223..c321bd2372ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7346,6 +7346,7 @@ with pkgs; curl = curlMinimal.override ({ idnSupport = true; + pslSupport = true; zstdSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { brotliSupport = true;