diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-14 16:08:18 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-14 16:32:30 +0200 |
| commit | 8728b288d1fa7f0fde629a408946ddbece22485c (patch) | |
| tree | 3d6679be69bd38868d5ece74284a88afe876ac55 | |
| parent | firefox: 89.0.2 -> 90.0 (diff) | |
| download | nixpkgs-8728b288d1fa7f0fde629a408946ddbece22485c.tar.gz | |
firefox: use nss_latest for firefox >= 90
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 13cf0ea01624..30e37ff88361 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,7 +4,7 @@ { lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg -, freetype, fontconfig, file, nspr, nss, nss_3_53 +, freetype, fontconfig, file, nspr, nss_3_53 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification , libvpx_1_8 @@ -19,6 +19,7 @@ ## backported libraries +, nss_latest , rust-cbindgen_latest ## optional libraries @@ -124,7 +125,7 @@ let # 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; }; + nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss_latest.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 |