diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-04-19 14:39:58 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-04-19 14:41:28 +0200 |
| commit | b979f3be1f956228058179315d56203e05fd679b (patch) | |
| tree | df2ca42620707873ba4c860efe8f583e03031a05 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 55aa1bc36226e88765b700e16132365f269d9c67 (diff) | |
firefox-unwrapped: Apply patch for mozbz#1803016
https://bugzilla.mozilla.org/show_bug.cgi?id=1803016
Resolves crashes on wayland, when the either component of the window size
wouldn't be divisible by the desktop scaling.
Unfortunately marked wontfix for Firefox 112, so we apply this patch
instead.
Closes: #226539
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 306c344435a1..ce69742a3f6a 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -221,7 +221,15 @@ buildStdenv.mkDerivation ({ "profilingPhase" ]; - patches = [ ] + 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.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 |