diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-05-27 20:37:24 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-05-27 21:29:54 +0200 |
commit | 2f671ccc7a4bd8ffda8a63e7e188d246238dba64 (patch) | |
tree | 5ab6325a2e45afe99098f6fbd3f020c78003cb7b /nixos/tests/sway.nix | |
parent | f9b26b91a44df64e8e6c03ed2236c7f7b6a56d35 (diff) | |
download | nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.gz nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.bz2 nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.lz nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.xz nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.zst nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.zip |
nixos/tests/{sway,cage,cagebreak}: Fix the tests on aarch64-linux
Since the update to wlroots 0.13 (e03dde82a74) the default VGA card isn't supported anymore and we needed to switch to virtio (qxl didn't work either). However, as it turned out "-vga virtio" (28b8cff301f) broke the test on AArch64. Luckily there's a third option that works on all three supported platforms: virtio-gpu-pci According to [0] "This device lacks VGA compatibility mode but is otherwise identical to the virtio vga device. UEFI firmware can handle this, and if your guests has drivers too you can use this instead of virtio-vga. This will reduce the attack surface (no complex VGA emulation support) and reduce the memory footprint by 8 MB (no pci memory bar for VGA compatibility). This device can be placed in a PCI Express slot." So in the end this seems like the ideal choice :) See also [1]. [0]: https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/#virtio-gpu-pci [1]: https://patches.openembedded.org/patch/164351/
Diffstat (limited to 'nixos/tests/sway.nix')
-rw-r--r-- | nixos/tests/sway.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 1d23b0e9431..0985e0b4308 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -42,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : programs.gnupg.agent.enable = true; virtualisation.memorySize = 1024; - # Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch: - virtualisation.qemu.options = [ "-vga virtio" ]; + # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; enableOCR = true; |