diff options
Diffstat (limited to 'home-manager/tests/modules/misc/xsession')
-rw-r--r-- | home-manager/tests/modules/misc/xsession/basic.nix | 13 | ||||
-rw-r--r-- | home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix | 17 |
2 files changed, 19 insertions, 11 deletions
diff --git a/home-manager/tests/modules/misc/xsession/basic.nix b/home-manager/tests/modules/misc/xsession/basic.nix index 60623d1bf6b..39df6362380 100644 --- a/home-manager/tests/modules/misc/xsession/basic.nix +++ b/home-manager/tests/modules/misc/xsession/basic.nix @@ -14,6 +14,14 @@ with lib; profileExtra = "profile extra commands"; }; + nixpkgs.overlays = [ + (self: super: { + xorg = super.xorg // { + setxkbmap = super.xorg.setxkbmap // { outPath = "@setxkbmap@"; }; + }; + }) + ]; + nmt.script = '' assertFileExists home-files/.xprofile assertFileContent \ @@ -28,10 +36,7 @@ with lib; assertFileExists home-files/.config/systemd/user/setxkbmap.service assertFileContent \ home-files/.config/systemd/user/setxkbmap.service \ - ${pkgs.substituteAll { - src = ./basic-setxkbmap-expected.service; - inherit (pkgs.xorg) setxkbmap; - }} + ${./basic-setxkbmap-expected.service} ''; }; } diff --git a/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix b/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix index b7eb3decebb..015efe6154a 100644 --- a/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix +++ b/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix @@ -8,9 +8,7 @@ with lib; home.homeDirectory = "/test-home"; - home.keyboard = { - options = [ "ctrl:nocaps" "altwin:no_win" ]; - }; + home.keyboard = { options = [ "ctrl:nocaps" "altwin:no_win" ]; }; xsession = { enable = true; @@ -20,14 +18,19 @@ with lib; profileExtra = "profile extra commands"; }; + nixpkgs.overlays = [ + (self: super: { + xorg = super.xorg // { + setxkbmap = super.xorg.setxkbmap // { outPath = "@setxkbmap@"; }; + }; + }) + ]; + nmt.script = '' assertFileExists home-files/.config/systemd/user/setxkbmap.service assertFileContent \ home-files/.config/systemd/user/setxkbmap.service \ - ${pkgs.substituteAll { - src = ./keyboard-without-layout-expected.service; - inherit (pkgs.xorg) setxkbmap; - }} + ${./keyboard-without-layout-expected.service} ''; }; } |