From 8c5884ef4e9e5268bc1c2e5d35a87e5068a0868c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 23 Jul 2022 15:46:34 +0000
Subject: [PATCH] =?UTF-8?q?gnome.mutter:=2042.4=20=E2=86=92=2043.alpha?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mutter/-/compare/42.4...43.alpha

Co-Authored-By: Bobby Rong <rjl931189261@126.com>

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/desktops/gnome/core/mutter/default.nix   | 19 +++----------------
 .../gnome/core/mutter/fix-paths.patch         | 13 -------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/desktops/gnome/core/mutter/fix-paths.patch

diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index d49c1e2f6aa5..3c74d4759c12 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -1,5 +1,4 @@
 { fetchurl
-, substituteAll
 , runCommand
 , lib
 , stdenv
@@ -11,7 +10,6 @@
 , pango
 , json-glib
 , libstartup_notification
-, zenity
 , libcanberra
 , ninja
 , xvfb-run
@@ -46,26 +44,15 @@
 
 let self = stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "42.4";
+  version = "43.alpha";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "wix/o9GHBh2/KAw4UOEYt7UAkGXQHeMWFqzVAMSYKkA=";
+    sha256 = "IM4d5uTepo8AEFFihn6s6nJ26WdeconFgXIu/Pou7IA=";
   };
 
-  patches = [
-    # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
-    # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
-    # ./drop-inheritable.patch
-
-    (substituteAll {
-      src = ./fix-paths.patch;
-      inherit zenity;
-    })
-  ];
-
   mesonFlags = [
     "-Degl_device=true"
     "-Dinstalled_tests=false" # TODO: enable these
@@ -136,7 +123,7 @@ let self = stdenv.mkDerivation rec {
   PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
 
   passthru = {
-    libdir = "${self}/lib/mutter-10";
+    libdir = "${self}/lib/mutter-11";
 
     tests = {
       libdirExists = runCommand "mutter-libdir-exists" {} ''
diff --git a/pkgs/desktops/gnome/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch
deleted file mode 100644
index 6ac0a431f61f..000000000000
--- a/pkgs/desktops/gnome/core/mutter/fix-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/util.c b/src/core/util.c
-index 57b73747d..f424cc81c 100644
---- a/src/core/util.c
-+++ b/src/core/util.c
-@@ -636,7 +636,7 @@ meta_show_dialog (const char *type,
- 
-   args = g_ptr_array_new ();
- 
--  append_argument (args, "zenity");
-+  append_argument (args, "@zenity@/bin/zenity");
-   append_argument (args, type);
- 
-   if (display)