From 8e116f42e4865f5ec27ecc680836817fd2a3bc82 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Nov 2022 18:57:48 +0800 Subject: [PATCH 1/2] gnome.mutter: Revert clutter optimization causing issues on X11 This fixes "GNOME terminal freezes when maximized". Part of https://src.fedoraproject.org/rpms/mutter/c/89161ff. --- pkgs/desktops/gnome/core/mutter/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index e5bb71d394ee..1789b98928b3 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -65,6 +65,16 @@ 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; + }) ]; mesonFlags = [ From 9bf73cedb7831a2827ec3e84eebed40b8bea817e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Nov 2022 22:31:23 +0800 Subject: [PATCH 2/2] gnome.mutter: Backport edge resistance fix This fixes "Snapping window to the edges sometimes doesn't work". Part of https://src.fedoraproject.org/rpms/mutter/c/89161ff. --- pkgs/desktops/gnome/core/mutter/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 1789b98928b3..3cba6b652cce 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -75,6 +75,13 @@ let self = stdenv.mkDerivation rec { 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 = [