gnome.mutter: 44.beta → 44.rc

https://gitlab.gnome.org/GNOME/mutter/-/compare/44.beta...44.rc

GTK 3 is now only used by tests, let’s disable them.

This will require us to explicitly add libraries listed as dependencies by Mutter’s X11 client that were previously propagated by GTK 3.
While at it let’s put them into their own block in preparation for future when the X11 client is optional.

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

1 files changed, 39 insertions, 14 deletions

diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index d8434c3f0be..c4c1ae6be40 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -15,19 +15,29 @@
 , libcanberra
 , ninja
 , xvfb-run
-, xkeyboard_config
 , libxcvt
-, libxkbfile
 , libICE
+, libX11
+, libXcomposite
+, libXcursor
 , libXdamage
-, libxkbcommon
+, libXext
+, libXfixes
+, libXi
 , libXtst
+, libxkbfile
+, xkeyboard_config
+, libxkbcommon
+, libXrender
+, libxcb
+, libXrandr
+, libXinerama
+, libXau
 , libinput
 , libdrm
 , gsettings-desktop-schemas
 , glib
 , atk
-, gtk3
 , gtk4
 , fribidi
 , harfbuzz
@@ -35,6 +45,7 @@
 , pipewire
 , libgudev
 , libwacom
+, libSM
 , xwayland
 , mesa
 , meson
@@ -54,18 +65,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "44.beta";
+  version = "44.rc";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    sha256 = "+Lgh89e9o9o5yzygwDg84sn/HCqzFNyJXoRyKBVxKkc=";
+    sha256 = "aQynddetFbm1DA48J2w+xH/Fvi+AVhLDZ1guay3jgls=";
   };
 
   mesonFlags = [
     "-Degl_device=true"
     "-Dinstalled_tests=false" # TODO: enable these
+    "-Dtests=false"
     "-Dwayland_eglstream=true"
     "-Dprofiler=true"
     "-Dxwayland_path=${xwayland}/bin/Xwayland"
@@ -78,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs = [
     # required for pkg-config to detect mutter-clutter
     json-glib
-    libXtst
     libcap_ng
     graphene
   ];
@@ -107,8 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection
     gsettings-desktop-schemas
     atk
-    gtk3
-    gtk4
     fribidi
     harfbuzz
     libcanberra
@@ -117,19 +126,35 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libstartup_notification
     libwacom
-    libxkbcommon
-    libxkbfile
-    libICE
-    libXdamage
+    libSM
     colord
     lcms2
     pango
     pipewire
     sysprof # for D-Bus interfaces
     libsysprof-capture
-    xkeyboard_config
     xwayland
     wayland-protocols
+  ] ++ [
+    # X11 client
+    gtk4
+    libICE
+    libX11
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXtst
+    libxkbfile
+    xkeyboard_config
+    libxkbcommon
+    libXrender
+    libxcb
+    libXrandr
+    libXinerama
+    libXau
   ];
 
   postPatch = ''