diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2021-09-13 10:17:02 -0700 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2021-09-13 12:53:50 -0700 |
| commit | 25532a7fbb9443f810b2ac2bdfd643497b100713 (patch) | |
| tree | 5243ef1a3b4f79c5698d688caeb3fdd5ed387c79 | |
| parent | Merge pull request #137663 from NixOS/backport-137645-to-release-21.05 (diff) | |
| download | nixpkgs-25532a7fbb9443f810b2ac2bdfd643497b100713.tar.gz | |
firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92
Closes: #137649
(cherry picked from commit dfccb3045e76872eda32cdfa338dbe6aae8ccfcb)
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 916a2da30b71..f7c92be9a8a1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -163,6 +163,23 @@ buildStdenv.mkDerivation ({ sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) + # These fix Firefox on sway and other non-Gnome wayland WMs. They should be + # removed whenever the following two patches make it onto a release: + # 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8 + # 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4 + # This will probably happen in the next point release, but let's be careful + # and double check whether it's working on sway on the next v bump. + ++ lib.optionals (lib.versionAtLeast ffversion "92") [ + (fetchpatch { + url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4"; + sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8="; + }) + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8"; + sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA="; + }) + ] + ++ patches; |