From 82527892e46a17cff16c5842e2354a7f5b8d0025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 Sep 2023 15:51:59 +0200 Subject: [PATCH] firefox-esr: use nss_esr as intended Firefox 115 is meant against nss 3.90, as you can see e.g. in https://hg.mozilla.org/releases/mozilla-release/file/FIREFOX_115_0_3_RELEASE/security/nss/TAG-INFO --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 753e1c9d59ef..bb4b1ba0a85d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -469,7 +469,7 @@ buildStdenv.mkDerivation { # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ] - ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ] + ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed