diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-10-09 03:39:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-09 03:39:49 +0100 |
| commit | 856913b19186948105a4417909780f5d63171fac (patch) | |
| tree | f23c70e223a78b6b4f6073fc958e78dfb48cefdb /pkgs/applications | |
| parent | 7a3a25044d9b50cd9981ef19eb3a31600bb88c15 (diff) | |
| parent | 9415562f1f62442ee5a941a4daa9bfe44aa1bcba (diff) | |
Merge pull request #136777 from lukegb/buildcatrust
use buildcatrust to generate trust stores
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2600b5209bb15..a1a215aefcbdd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -117,9 +117,7 @@ let then overrideCC stdenv llvmPackages.clangUseLLVM else stdenv; - # 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 version "83" then nss_3_53 else nss.override { useP11kit = false; }; + nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss; # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking |