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

Merge pull request #259222 from bobby285271/fix/gnome-flashback-eval 

nixosTests.gnome-flashback: Fix eval
parents 69590b66 190a819e

nixos/modules/services/x11/desktop-managers/gnome.nix

+3 −4
Original line number Diff line number Diff line
@@ -307,10 +307,9 @@ in 
        gnome-flashback

      ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms;



      # gnome-panel needs these for menu applet

      environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ];

      # TODO: switch to sessionVariables (resolve conflict)

      environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ];

      environment.systemPackages = with pkgs.gnome; [

        gnome-flashback

      ];

    })



    (mkIf serviceCfg.core-os-services.enable {

nixos/tests/gnome-flashback.nix

+4 −3
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { 
          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")



      with subtest("Wait for Metacity"):

          machine.wait_until_succeeds(

              "pgrep metacity"

          )

          machine.wait_until_succeeds("pgrep metacity")



      with subtest("Regression test for #233920"):

          machine.wait_until_succeeds("pgrep -fa gnome-flashback-media-keys")

          machine.sleep(20)

          machine.screenshot("screen")

    '';