curl: remove outdated meta.broken check for pkgsStatic and brotliSupport (#494111)
This commit is contained in:
@@ -286,8 +286,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
Scrumplex
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
# Fails to link against static brotli or gss
|
||||
broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport);
|
||||
# Fails to link against static gss
|
||||
broken = stdenv.hostPlatform.isStatic && gssSupport;
|
||||
pkgConfigModules = [ "libcurl" ];
|
||||
mainProgram = "curl";
|
||||
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "haxx" finalAttrs.version;
|
||||
|
||||
@@ -2181,17 +2181,13 @@ with pkgs;
|
||||
websocketSupport = true;
|
||||
};
|
||||
|
||||
curl = curlMinimal.override (
|
||||
{
|
||||
idnSupport = true;
|
||||
pslSupport = true;
|
||||
zstdSupport = true;
|
||||
http3Support = true;
|
||||
}
|
||||
// lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
|
||||
brotliSupport = true;
|
||||
}
|
||||
);
|
||||
curl = curlMinimal.override {
|
||||
idnSupport = true;
|
||||
pslSupport = true;
|
||||
zstdSupport = true;
|
||||
http3Support = true;
|
||||
brotliSupport = true;
|
||||
};
|
||||
|
||||
curlWithGnuTls = curl.override {
|
||||
gnutlsSupport = true;
|
||||
|
||||
Reference in New Issue
Block a user