tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-10 17:54:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

mate.mate-wayland-session: 1.28.3 -> 1.28.4

Browse source 
https://github.com/mate-desktop/mate-wayland-session/compare/v1.28.3...v1.28.4
This commit is contained in:
Bobby Rong 2025-09-03 20:36:39 +08:00
parent d0fc308996
commit 04865fae77
No known key found for this signature in database
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/mate-wayland.nix
View file

@ -56,7 +56,7 @@
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'") machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
with subtest("Check if Wayfire config is properly configured"): 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}'") machine.wait_until_succeeds(f"cat /home/${user.name}/.config/mate/wayfire.ini | grep '{i}'")
with subtest("Check if Wayfire has ever coredumped"): with subtest("Check if Wayfire has ever coredumped"):

13
pkgs/desktops/mate/mate-wayland-session/default.nix
View file

@ -7,20 +7,20 @@
glib, glib,
mate-polkit, mate-polkit,
mate-notification-daemon, mate-notification-daemon,
mate-settings-daemon,
wayfire, wayfire,
wayfirePlugins,
gitUpdater, gitUpdater,
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mate-wayland-session"; pname = "mate-wayland-session";
version = "1.28.3"; version = "1.28.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mate-desktop"; owner = "mate-desktop";
repo = "mate-wayland-session"; repo = "mate-wayland-session";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-sUAq2BylsvjYn8Lt+nm4yIfVhzIEefxKZYnhJnuxjs0="; hash = "sha256-jcYkiJOo1k0bMP/LkBW+QIrSyoj6qi8zZMTxqmuNQd0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,15 +33,12 @@ stdenvNoCC.mkDerivation rec {
substituteInPlace session/mate-wayland-components.sh \ substituteInPlace session/mate-wayland-components.sh \
--replace-fail "polkit-mate-authentication-agent-1" "${mate-polkit}/libexec/polkit-mate-authentication-agent-1" \ --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-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/blueman-applet" "command -v blueman-applet" \
--replace-fail "cat /usr/bin/gnome-keyring-daemon" "command -v gnome-keyring-daemon" --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 \ 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/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"
''; '';
passthru = { passthru = {