diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-15 01:34:36 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-15 01:34:36 +0200 |
| commit | adf4e67dd414babe715e17eaf5dfbc8d63a06cae (patch) | |
| tree | 53a5e209186782fc1127b778bab773be9d7d6a57 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 850a9bf3f2c65c98452640162262e7a807f7609f (diff) | |
| parent | c3c77ae81271cce85e0117a1dd316fdcf94be74b (diff) | |
| download | nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.gz nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.bz2 nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.lz nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.xz nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.zst nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.zip | |
Merge remote-tracking branch 'origin/staging' into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -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 2600b5209bb..a1a215aefcb 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 |