diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0a578520ae2..a062d767d13 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -55,6 +55,7 @@ , gnum4 , gtk3 , icu +, icu72 , libGL , libGLU , libevent @@ -238,6 +239,19 @@ buildStdenv.mkDerivation ({ hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; }) ] + ++ lib.optional (lib.versionOlder version "109") [ + # cherry-pick bindgen change to fix build with clang 16 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f"; + hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU="; + }) + ] + ++ lib.optional (lib.versionOlder version "111") [ + # cherry-pick mp4parse change fixing build with Rust 1.70+ + # original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 + # vendored to update checksums + ./mp4parse-rust-170.patch + ] ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch @@ -428,7 +442,6 @@ buildStdenv.mkDerivation ({ freetype glib gtk3 - icu libffi libGL libGLU @@ -456,6 +469,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 |