summary refs log tree commit diff
path: root/pkgs/tools/networking/curl
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-04-17 20:29:43 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-04-17 20:29:43 +0200
commit70d726c2a51ee60015b68d6c3b40de55fa59cc9c (patch)
treea83469ae1fb44ebc71c7143b1fc5332148194f78 /pkgs/tools/networking/curl
parentf6bedc13d16a03565d11663a7df937102bc44535 (diff)
parent212dde2609b3011da6f7ba65b45a002fcc40ea7e (diff)
downloadnixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.tar
nixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.tar.gz
nixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.tar.bz2
nixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.tar.lz
nixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.tar.xz
nixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.tar.zst
nixpkgs-70d726c2a51ee60015b68d6c3b40de55fa59cc9c.zip
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/tools/networking/curl')
-rw-r--r--pkgs/tools/networking/curl/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index a7cac48d52d..7c7f301552e 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -110,7 +110,8 @@ stdenv.mkDerivation rec {
       "--disable-manual"
       # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback
       # to nss-cacert from the default profile.
-      "--without-ca-bundle"
+      # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3
+      (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle")
       "--without-ca-path"
       (lib.enableFeature c-aresSupport "ares")
       (lib.enableFeature ldapSupport "ldap")