From 815aa90ee39d2488ca421cc955d18fe17950c49d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 12 Aug 2023 06:16:59 +0000
Subject: [PATCH] =?UTF-8?q?gnome.mutter:=2045.alpha=20=E2=86=92=2045.beta.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mutter/-/compare/45.alpha...45.beta.1

New libei dependency:

https://github.com/GNOME/mutter/commit/2fb3bdf774d40c2b6566c3c623bdfe1a25f3bea9

Also applies a temporarily fix for sysprof-6:

https://github.com/NixOS/nixpkgs/commit/7405bad6098860e5e28ff5fc82ae811b54ad137e

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/desktops/gnome/core/mutter/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index b0b8e4ce7e30..91179396048c 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -35,6 +35,7 @@
 , libXau
 , libinput
 , libdrm
+, libei
 , gsettings-desktop-schemas
 , glib
 , atk
@@ -66,13 +67,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "45.alpha";
+  version = "45.beta.1";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    sha256 = "DgyXx8AE+O9asrKugf5/61r/DUR1eRflBZhjNpsizk0=";
+    sha256 = "n5OWijQm4DiCeIo3J7DKZ9zGaKkXddzUeRj5zylcFM4=";
   };
 
   mesonFlags = [
@@ -123,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libcanberra
     libdrm
+    libei
     libgudev
     libinput
     libstartup_notification
@@ -161,6 +163,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs src/backends/native/gen-default-modes.py
+
+    # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3142
+    substituteInPlace meson.build \
+      --replace "dependency('sysprof-4')" "dependency('sysprof-6')"
   '';
 
   postInstall = ''