From 04865fae77dd3fc37b6ce35b8dc9445fe12b9f9a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 3 Sep 2025 20:36:39 +0800
Subject: [PATCH] mate.mate-wayland-session: 1.28.3 -> 1.28.4

https://github.com/mate-desktop/mate-wayland-session/compare/v1.28.3...v1.28.4
---
 nixos/tests/mate-wayland.nix                        |  2 +-
 pkgs/desktops/mate/mate-wayland-session/default.nix | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index c2e0ee1feaf7..b5856facd2ac 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -56,7 +56,7 @@
           machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
       with subtest("Check if Wayfire config is properly configured"):
-          for i in ["button_style = mate", "firedecor", "mate-wayland-components.sh"]:
+          for i in ["autostart_wf_shell = false", "mate-wayland-components.sh"]:
               machine.wait_until_succeeds(f"cat /home/${user.name}/.config/mate/wayfire.ini | grep '{i}'")
 
       with subtest("Check if Wayfire has ever coredumped"):
diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/desktops/mate/mate-wayland-session/default.nix
index 51dafef9f939..53601672c1b3 100644
--- a/pkgs/desktops/mate/mate-wayland-session/default.nix
+++ b/pkgs/desktops/mate/mate-wayland-session/default.nix
@@ -7,20 +7,20 @@
   glib,
   mate-polkit,
   mate-notification-daemon,
+  mate-settings-daemon,
   wayfire,
-  wayfirePlugins,
   gitUpdater,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "mate-wayland-session";
-  version = "1.28.3";
+  version = "1.28.4";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-wayland-session";
     rev = "v${version}";
-    hash = "sha256-sUAq2BylsvjYn8Lt+nm4yIfVhzIEefxKZYnhJnuxjs0=";
+    hash = "sha256-jcYkiJOo1k0bMP/LkBW+QIrSyoj6qi8zZMTxqmuNQd0=";
   };
 
   nativeBuildInputs = [
@@ -33,15 +33,12 @@ stdenvNoCC.mkDerivation rec {
     substituteInPlace session/mate-wayland-components.sh \
       --replace-fail "polkit-mate-authentication-agent-1" "${mate-polkit}/libexec/polkit-mate-authentication-agent-1" \
       --replace-fail "mate-notification-daemon" "${mate-notification-daemon}/libexec/mate-notification-daemon" \
+      --replace-fail "mate-settings-daemon" "${mate-settings-daemon}/libexec/mate-settings-daemon" \
       --replace-fail "cat /usr/bin/blueman-applet" "command -v blueman-applet" \
       --replace-fail "cat /usr/bin/gnome-keyring-daemon" "command -v gnome-keyring-daemon"
 
-    # Ensure wayfire.ini is writable, as this script tries to modify it later.
     substituteInPlace session/mate-wayland.sh \
-      --replace-fail "cp /usr/share/doc/wayfire/examples/wayfire.ini" "cp --no-preserve=mode,ownership ${wayfire.src}/wayfire.ini" \
-      --replace-fail "/usr/share/doc/wayfire/examples/wayfire.ini" "${wayfire.src}/wayfire.ini" \
-      --replace-fail "/usr/lib/x86_64-linux-gnu/wayfire/libfiredecor.so" "${wayfirePlugins.firedecor}/lib/wayfire/libfiredecor.so" \
-      --replace-fail "/usr/share/doc/firedecor/firedecor.config" "$out/share/doc/firedecor/firedecor.config"
+      --replace-fail "/usr/share/doc/wayfire/examples/wayfire.ini" "${wayfire.src}/wayfire.ini"
   '';
 
   passthru = {