diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-11-20 17:50:41 -0800 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-11-20 17:50:41 -0800 |
| commit | 2175b157acf1fd338021bc162ec7c4d6d7f90306 (patch) | |
| tree | 42240c01e72f022fd6d3bb2664960745e9ff757a /nixos/modules/virtualisation/qemu-vm.nix | |
| parent | 6aded65e28c8805bfb81e6b5fc1613633480eb16 (diff) | |
| download | nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.gz nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.bz2 nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.lz nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.xz nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.zst nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.zip | |
treewide: refactor isi686 && isx86_64 -> isx86
Diffstat (limited to 'nixos/modules/virtualisation/qemu-vm.nix')
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0c2782d3e02..e9802f2bd9c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -97,7 +97,7 @@ let imap1 (idx: drive: drive // { device = driveDeviceName idx; }); efiPrefix = - if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then "${pkgs.OVMF.fd}/FV/OVMF" + if pkgs.stdenv.hostPlatform.isx86 then "${pkgs.OVMF.fd}/FV/OVMF" else if pkgs.stdenv.isAarch64 then "${pkgs.OVMF.fd}/FV/AAVMF" else throw "No EFI firmware available for platform"; efiFirmware = "${efiPrefix}_CODE.fd"; @@ -833,7 +833,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ - (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ + (mkIf pkgs.stdenv.hostPlatform.isx86 [ "-usb" "-device usb-tablet,bus=usb-bus.0" ]) (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ |