movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge pull request #146829 from r-burns/isx86

Browse source
This commit is contained in:
Sandro 2021-11-21 14:20:12 +01:00 • committed by GitHub
commit 07f29d2db2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/installer.nix
View file

@ -70,7 +70,7 @@ let
let iface = if grubVersion == 1 then "ide" else "virtio";
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";
in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then
throw "Non-EFI boot methods are only supported on i686 / x86_64"
else ''
def assemble_qemu_flags():