summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2021-06-08 20:29:28 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-06-09 12:55:23 +0000
commit0647103d181a7c73caa9aacce4b80b3beafb6419 (patch)
treedc627a1d33880171c9443504607306649b8eb5d7
parentblender: add libharu as dependency (diff)
downloadnixpkgs-0647103d181a7c73caa9aacce4b80b3beafb6419.tar.gz
firefox: use nss without p11-kit
Quickfix to allow firefox to recognize certificates as trusted by Mozilla. Related: #126065 (cherry picked from commit 42e25d855fa959b7832fbdbc0a384294460d9258)
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 62e641280b66..51a671cb198f 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -122,7 +122,9 @@ let
then overrideCC stdenv llvmPackages.clangUseLLVM
else stdenv;
- nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
+ # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY
+ # https://github.com/NixOS/nixpkgs/issues/126065
+ nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss.override { useP11kit = false; };
# --enable-release adds -ffunction-sections & LTO that require a big amount of
# RAM and the 32-bit memory space cannot handle that linking