From 615cdbd7f761d83c98563b5fbfe60add30f019c8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 7 Aug 2024 13:35:46 +0000
Subject: [PATCH] =?UTF-8?q?mutter:=2046.4=20=E2=86=92=2047.beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mutter/-/compare/46.4...47.beta

xrender dropped in https://github.com/GNOME/mutter/commit/669d21daa2eb4a5cfe920fd9c0f7f1451b67551d.

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
---
 pkgs/by-name/mu/mutter/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 720c78526070..89c28da2aab5 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -28,7 +28,6 @@
   libxkbfile,
   xkeyboard_config,
   libxkbcommon,
-  libXrender,
   libxcb,
   libXrandr,
   libXinerama,
@@ -68,7 +67,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "46.4";
+  version = "47.beta";
 
   outputs = [
     "out"
@@ -79,13 +78,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YRvZz5gq21ZZfOKzQiQnL9phm7O7kSpoTXXG8sN1AuQ=";
+    hash = "sha256-yJ6ARNnVy2FmOji96aGTKTY+MXH5qv6O6eqb3xgFt7U=";
   };
 
   mesonFlags = [
     "-Degl_device=true"
     "-Dinstalled_tests=false" # TODO: enable these
-    "-Dtests=false"
+    "-Dtests=disabled"
     "-Dwayland_eglstream=true"
     "-Dprofiler=true"
     "-Dxwayland_path=${lib.getExe xwayland}"
@@ -159,7 +158,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbfile
     xkeyboard_config
     libxkbcommon
-    libXrender
     libxcb
     libXrandr
     libXinerama
@@ -177,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     # TODO: Move this into a directory devhelp can find.
-    moveToOutput "share/mutter-14/doc" "$devdoc"
+    moveToOutput "share/mutter-15/doc" "$devdoc"
   '';
 
   # Install udev files into our own tree.
@@ -186,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
   separateDebugInfo = true;
 
   passthru = {
-    libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
+    libdir = "${finalAttrs.finalPackage}/lib/mutter-15";
 
     tests = {
       libdirExists = runCommand "mutter-libdir-exists" { } ''