pkgsStatic.curl: fix build

904625852d removed the overlay which
disables gss and brotli for static curl. Although we can now build them
statically, attempting to build curl against them results in 'undefined
reference' linker errors.
main
Ryan Burns 3 years ago committed by Raphael Megzari
parent 09f5763784
commit 42155910a0
  1. 2
      pkgs/tools/networking/curl/default.nix
  2. 5
      pkgs/top-level/all-packages.nix

@ -145,5 +145,7 @@ stdenv.mkDerivation rec {
license = licenses.curl;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
# Fails to link against static brotli or gss
broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport);
};
}

@ -4109,11 +4109,12 @@ with pkgs;
ldapSupport = true;
};
curl = curlMinimal.override {
curl = curlMinimal.override ({
idnSupport = true;
} // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
gssSupport = true;
brotliSupport = true;
};
});
curlMinimal = callPackage ../tools/networking/curl { };

Loading…
Cancel
Save