From 2e9847243ac8e474ec6142bcbf6bb721ef6f27d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Apr 2023 14:39:58 +0200 Subject: [PATCH] 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 (cherry picked from commit b979f3be1f956228058179315d56203e05fd679b) --- .../networking/browsers/firefox/common.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 28174b95bf15..ca3b9398bfe3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -222,7 +222,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