diff options
| author | Jacek Galowicz <jacek@galowicz.de> | 2022-11-25 11:40:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 11:40:10 +0100 |
| commit | 56b66f51fdbc5a3b82ea860e6ac7fa7049cadc33 (patch) | |
| tree | 19a03b906837dc9f6da0b5e07fb2bc88f9badd85 | |
| parent | prometheus: 2.40.2 -> 2.40.3 (diff) | |
| parent | gnome.mutter: Backport edge resistance fix (diff) | |
| download | nixpkgs-56b66f51fdbc5a3b82ea860e6ac7fa7049cadc33.tar.gz | |
Merge pull request #202821 from NixOS/backport-202659-to-release-22.11
[Backport release-22.11] gnome.mutter: Backport regression fixes
| -rw-r--r-- | pkgs/desktops/gnome/core/mutter/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index e5bb71d394ee..3cba6b652cce 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -65,6 +65,23 @@ let self = stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) + + # Revert clutter optimization causing issues on X11 + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2667 + # Will be replaced with a proper fix in 43.2 + # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6054 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/7e7a639cc5132cf3355e861235f325540fe56548.patch"; + sha256 = "NYoKCRh5o1Q15c11a79Hk5tGKq/jOa+e6GpgBjPEepo="; + revert = true; + }) + + # Backport edge resistance fix (should be part of 43.2) + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2687 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/accf532a29ea9a1d70880dfaa1834050aa3ae7be.patch"; + sha256 = "XAHcPGQFWfZujlqO/cvUryojPCMBBSxeIG06BesDQQw="; + }) ]; mesonFlags = [ |