From f3d301ab8196d0f6f290a68f2348201bc7ac0670 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 30 Mar 2022 01:18:38 +0200 Subject: [PATCH] thunderbird{-bin}|firefox|librewolf: use nss_latest for regular releases and nss_esr for esr releases --- pkgs/applications/networking/browsers/firefox/common.nix | 5 +++-- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a1e836151350..e43251be80cc 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -61,7 +61,8 @@ , libwebp , nasm , nspr -, nss +, nss_esr +, nss_latest , pango , xorg , zip @@ -356,7 +357,6 @@ buildStdenv.mkDerivation ({ libwebp nasm nspr - nss pango perl xorg.libX11 @@ -373,6 +373,7 @@ buildStdenv.mkDerivation ({ zip zlib ] + ++ [ (if (lib.versionAtLeast version "92") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gssSupport libkrb5 diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 98792527faf1..e4e5332e07f3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -38,7 +38,7 @@ , adwaita-icon-theme , libGLU, libGL , nspr -, nss +, nss_latest , pango , pipewire , pciutils @@ -132,7 +132,7 @@ stdenv.mkDerivation { libnotify libGLU libGL nspr - nss + nss_latest pango pipewire pciutils