diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-28 03:58:48 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-28 03:58:48 +0100 |
commit | 3303ff548b21ccdadeab3f9a670775a969c72444 (patch) | |
tree | 7cb387d892e01ff608f22faa95ce7a075cfa8346 /pkgs/applications/networking/browsers/firefox/common.nix | |
parent | 19173a85eb60db6efe117523d4e597a182aae69b (diff) |
buildMozillaMach: prune patches
The oldest version we support is at 115 right now, so we can drop
everything older than that.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 833d8799d936..ffe1786be32e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -225,34 +225,7 @@ buildStdenv.mkDerivation { "profilingPhase" ]; - patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [ - (fetchpatch { - # Crash when desktop scaling does not divide window scale on Wayland - # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016 - name = "mozbz1803016.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb"; - hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA="; - }) - ] ++ lib.optionals (lib.versionOlder version "114.0") [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1830040 - # https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8 - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12"; - hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; - }) - ] - ++ lib.optionals (lib.versionOlder version "102.13") [ - # 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="; - }) - # 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.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [ + patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [ # dbus cflags regression fix # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 (fetchpatch { @@ -260,7 +233,6 @@ buildStdenv.mkDerivation { hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI="; }) ] - ++ 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" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch |