Revert Merge #107275: nixos: fix "nixos-rebuild ...

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

This reverts commit 2025728, reversing
changes made to 926a1b2.
It broke nixosTests.installer.simpleUefiSystemdBoot
and right now channel is lagging behing for two weeks.

nixos/modules/virtualisation/qemu-vm.nix

@@ -605,10 +605,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.

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 ];