mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
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
This commit is contained in:
parent
d0fc308996
commit
04865fae77
|
|
@ -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"):
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue