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/
This commit is contained in:
Martin Weinelt 2024-01-29 18:12:56 +01:00
parent 301ae03634
commit 996b4ebc08
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 2 additions and 0 deletions

View File

@ -120,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature rtmpSupport "librtmp") (lib.withFeature rtmpSupport "librtmp")
(lib.withFeature rustlsSupport "rustls") (lib.withFeature rustlsSupport "rustls")
(lib.withFeature zstdSupport "zstd") (lib.withFeature zstdSupport "zstd")
(lib.withFeature pslSupport "libpsl")
(lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli)) (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli))
(lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
(lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2)) (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))

View File

@ -7346,6 +7346,7 @@ with pkgs;
curl = curlMinimal.override ({ curl = curlMinimal.override ({
idnSupport = true; idnSupport = true;
pslSupport = true;
zstdSupport = true; zstdSupport = true;
} // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
brotliSupport = true; brotliSupport = true;