b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
nixosTests.gnome-flashback: Fix eval
This commit is contained in:
Bobby Rong 2023-10-06 17:31:44 +08:00 committed by GitHub
parent 69590b6698 190a819ecb
commit 49dda70dbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/x11/desktop-managers/gnome.nix
View file

@ -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 {

7
nixos/tests/gnome-flashback.nix
View file

@ -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")
'';