From ca119749d86f484066fae7680af8a44ea1f11ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 23 Dec 2020 20:58:12 +0100
Subject: [PATCH] Revert Merge #107275: nixos: fix "nixos-rebuild ...

... build-vm-with-bootloader" for EFI systems

(cherry picked from commit 57a787c9fa91 or reverted from 9a5a4c70531)
It breaks nixosTests.installer.simpleUefiSystemdBoot
and blocks nixos-20.09 channel.
---
 nixos/modules/virtualisation/qemu-vm.nix | 4 ----
 nixos/tests/systemd-boot.nix             | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index d99494015d03..42e43f5ee023 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -596,10 +596,6 @@ in
 
     virtualisation.bootDevice = mkDefault (driveDeviceName 1);
 
-    virtualisation.useEFIBoot = mkDefault
-      (config.boot.loader.systemd-boot.enable ||
-       config.boot.loader.efi.canTouchEfiVariables);
-
     virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
     # FIXME: Consolidate this one day.
diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix
index a37c87bccc28..7a663dd9b428 100644
--- a/nixos/tests/systemd-boot.nix
+++ b/nixos/tests/systemd-boot.nix
@@ -9,6 +9,7 @@ with pkgs.lib;
 let
   common = {
     virtualisation.useBootLoader = true;
+    virtualisation.useEFIBoot = true;
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
     environment.systemPackages = [ pkgs.efibootmgr ];