Unverified Commit 68363855 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

curl: remove outdated meta.broken check for pkgsStatic and brotliSupport (#494111)

parents 6846eb68 1f6c54c2

pkgs/by-name/cu/curlMinimal/package.nix

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

pkgs/top-level/all-packages.nix

+7 −11
Original line number Diff line number Diff line
@@ -2181,17 +2181,13 @@ with pkgs; 
    websocketSupport = true;

  };



  curl = curlMinimal.override (

    {

  curl = curlMinimal.override {

    idnSupport = true;

    pslSupport = true;

    zstdSupport = true;

    http3Support = true;

    }

    // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {

    brotliSupport = true;

    }

  );

  };



  curlWithGnuTls = curl.override {

    gnutlsSupport = true;