colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustls-ffi: temporarily drop passthru.tests.curl

Browse Source 
It currently does not build but the situation is being handled upstream.
This commit is contained in:
Thomas Gerbet 2024-04-07 18:06:10 +02:00
parent 2e4e6618cb
commit 6ea5b5f2c5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/rustls-ffi/default.nix
View File

@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec {
passthru.tests = { passthru.tests = {
apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; apacheHttpd = apacheHttpd.override { modTlsSupport = true; };
curl = curl.override { opensslSupport = false; rustlsSupport = true; }; # Currently broken notably because of https://github.com/curl/curl/issues/13248
# curl = curl.override { opensslSupport = false; rustlsSupport = true; };
}; };
meta = with lib; { meta = with lib; {

2
pkgs/tools/networking/curl/default.nix
View File

@ -211,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all; platforms = platforms.all;
# Fails to link against static brotli or gss # Fails to link against static brotli or gss
broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin"); broken = (stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin")) || rustlsSupport;
pkgConfigModules = [ "libcurl" ]; pkgConfigModules = [ "libcurl" ];
mainProgram = "curl"; mainProgram = "curl";
}; };