JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/tests/cagebreak: use wayland-info instead of wallutils

Browse Source 
wayland-info from wayland-utils is already used in other Wayland
tests whereas wallutils' wayinfo is not.
This commit is contained in:
Nicolas Berbiche 2021-05-18 22:02:20 -04:00
parent 667950d4e8
commit 5e2cedfae3
No known key found for this signature in database
GPG Key ID: FA5696EDF35DA0B6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/cagebreak.nix
View File

@ -33,7 +33,7 @@ in
hardware.opengl.enable = true; hardware.opengl.enable = true;
programs.xwayland.enable = true; programs.xwayland.enable = true;
environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ]; environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ];
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
# Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch: # Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch:
@ -51,7 +51,7 @@ in
machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0") machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0")
with subtest("ensure wayland works with wayinfo from wallutils"): with subtest("ensure wayland works with wayinfo from wallutils"):
print(machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayinfo")) print(machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayland-info"))
# TODO: Fix the XWayland test (log the cagebreak output to debug): # TODO: Fix the XWayland test (log the cagebreak output to debug):
# with subtest("ensure xwayland works with xterm"): # with subtest("ensure xwayland works with xterm"):