Unverified Commit 93fc62fd authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #220308 from amjoseph-nixpkgs/pr/hydra/fix-eval

nixos/tests/installer.nix: fix hydra eval
parents c8d5ba14 4d15fb3a
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ 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.hostPlatform.isx86 then
      throw "Non-EFI boot methods are only supported on i686 / x86_64"
    else ''
    in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then ''
      machine.succeed("true")
    '' else ''
      def assemble_qemu_flags():
          flags = "-cpu max"
          ${if (system == "x86_64-linux" || system == "i686-linux")