public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox: use nspr_latest for 91 and later

Browse Source
This commit is contained in:
Martin Weinelt 2021-08-10 12:31:10 +02:00
parent fe2138efeb
commit 4012d5b533
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -19,6 +19,7 @@
## backported libraries ## backported libraries
, nspr_latest
, nss_latest , nss_latest
, rust-cbindgen_latest , rust-cbindgen_latest
@ -95,6 +96,7 @@ let
then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
else "/bin"; else "/bin";
nspr_pkg = if lib.versionAtLeast ffversion "91" then nspr_latest else nspr;
rust-cbindgen_pkg = if lib.versionAtLeast ffversion "89" then rust-cbindgen_latest else rust-cbindgen; rust-cbindgen_pkg = if lib.versionAtLeast ffversion "89" then rust-cbindgen_latest else rust-cbindgen;
# 78 ESR won't build with rustc 1.47 # 78 ESR won't build with rustc 1.47
@ -185,7 +187,7 @@ buildStdenv.mkDerivation ({
# yasm can potentially be removed in future versions # yasm can potentially be removed in future versions
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
nspr nss_pkg nspr_pkg nss_pkg
] ]
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
@ -371,7 +373,7 @@ buildStdenv.mkDerivation ({
version = ffversion; version = ffversion;
inherit alsaSupport; inherit alsaSupport;
inherit pipewireSupport; inherit pipewireSupport;
inherit nspr; inherit nspr_pkg;
inherit ffmpegSupport; inherit ffmpegSupport;
inherit gssSupport; inherit gssSupport;
inherit execdir; inherit execdir;