From bb75c6449c14df916e0506e0f02c86f55f8327b2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 7 Sep 2024 16:30:18 +0800 Subject: [PATCH 1/3] gnome-flashback: Fix mkSystemdTargetForWm eval Fixes "attribute 'gnome-flashback' missing". --- pkgs/by-name/gn/gnome-flashback/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index cfd2913d356b..d8dae346f057 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { }: runCommand "gnome-flashback-${wmName}.target" { } '' mkdir -p $out/lib/systemd/user - cp -r "${finalAttrs.gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \ + cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \ "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d" ''; From dc1c788778d78aaf5ac31a62de26a66dd81d8884 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 7 Sep 2024 16:33:41 +0800 Subject: [PATCH 2/3] nixos/tests/mate-wayland: Don't enable Pulseaudio Fixes "Using PipeWire as the sound server conflicts with PulseAudio". --- nixos/tests/mate-wayland.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix index e5c96d2af747..563f735c803a 100644 --- a/nixos/tests/mate-wayland.nix +++ b/nixos/tests/mate-wayland.nix @@ -20,8 +20,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; services.xserver.desktopManager.mate.enableWaylandSession = true; - hardware.pulseaudio.enable = true; - # Need to switch to a different GPU driver than the default one (-vga std) so that wayfire can launch: virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; From edd38d460c9df13f68ce01dacd5547223898d366 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 7 Sep 2024 17:03:20 +0800 Subject: [PATCH 3/3] nixos/tests/mate-wayland: Disable flaky OCR test Restarting the test helps though. The text is probably too small in size? --- nixos/tests/mate-wayland.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix index 563f735c803a..73f94ababc49 100644 --- a/nixos/tests/mate-wayland.nix +++ b/nixos/tests/mate-wayland.nix @@ -39,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Check if MATE session components actually start"): for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]: machine.wait_until_succeeds(f"pgrep -f {i}") - machine.wait_for_text('(Applications|Places|System)') # It is expected that this applet doesn't work in Wayland machine.wait_for_text('WorkspaceSwitcherApplet')