Unverified Commit d75e11e5 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

nixosTests.gnome-flashback, nixosTests.mate-wayland: Unbreak (#340274)

parents 8544965a edd38d46

nixos/tests/mate-wayland.nix

+0 −3
Original line number Diff line number Diff line
@@ -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" ];

  };
@@ -41,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')

pkgs/by-name/gn/gnome-flashback/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

      '';