diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-07 18:28:33 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-14 21:18:20 +0200 |
| commit | 9e78baf5c75ed87360dfcab4c5eeeee2256be2dc (patch) | |
| tree | d10cc72bff5a29c7c4a129028a0db84906e2ad89 /nixos/modules/virtualisation/qemu-vm.nix | |
| parent | caf4aa731608c1d06eaa59750749ff6f5be70234 (diff) | |
| download | nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.tar nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.tar.gz nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.tar.bz2 nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.tar.lz nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.tar.xz nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.tar.zst nixlib-9e78baf5c75ed87360dfcab4c5eeeee2256be2dc.zip | |
nixos/qemu-vm: Add virtualized display + HID devices on AArch64
Diffstat (limited to 'nixos/modules/virtualisation/qemu-vm.nix')
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3270f1507f9a..c5b1cc5375a4 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -434,9 +434,11 @@ in virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; - # FIXME: Figure out how to make this work on non-x86 - virtualisation.qemu.options = - mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]; + # FIXME: Consolidate this one day. + virtualisation.qemu.options = mkMerge [ + (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]) + (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) + ]; # Mount the host filesystem via 9P, and bind-mount the Nix store # of the host into our own filesystem. We use mkVMOverride to |