diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-06-20 22:41:20 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-06-20 22:41:20 +0200 |
| commit | e13e01a80af97cf4ee05b31e1e716a2ee3db427d (patch) | |
| tree | 2dbf1a672706ee1af2845fef2357f12d6690f085 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 468b8de1d6693e7555599ec5afc7c5d66dc32a0c (diff) | |
| download | nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.tar nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.tar.gz nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.tar.bz2 nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.tar.lz nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.tar.xz nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.tar.zst nixpkgs-e13e01a80af97cf4ee05b31e1e716a2ee3db427d.zip | |
buildMozilaMach: use latest icu from 115.0
The beta and devedition browsers already require icu73, so we need to relax this pin again. firefox-beta-unwrapped> 0:24.92 ERROR: Requested 'icu-i18n >= 73.1' but version of icu-i18n is 72.1
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 933740bef76..883c04a5a67 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -54,6 +54,7 @@ , glib , gnum4 , gtk3 +, icu , icu72 , libGL , libGLU @@ -440,9 +441,6 @@ buildStdenv.mkDerivation ({ freetype glib gtk3 - # icu73 changed how it follows symlinks which breaks in the firefox sandbox - # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 - icu72 libffi libGL libGLU @@ -470,6 +468,9 @@ buildStdenv.mkDerivation ({ zip zlib ] + # 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) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 |