qemu: fix qboot bios again

astro · May 15, 2023 · b973db3 · b973db3
1 parent dc58e7a
commit b973db3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/runners/qemu.nix b/lib/runners/qemu.nix
@@ -86,7 +86,6 @@ in {
       "-smp" (toString vcpu)
       "-enable-kvm"
       "-nodefaults" "-no-user-config"
-      "-bios" "${pkgs.qboot}/bios.bin"
       # qemu just hangs after shutdown, allow to exit by rebooting
       "-no-reboot"
       "-chardev" "stdio,mux=on,id=con0,signal=off"

diff --git a/nixos-modules/microvm/options.nix b/nixos-modules/microvm/options.nix
@@ -345,14 +345,16 @@ in
     qemu.bios = {
       enable = mkOption {
         type = types.bool;
-        default = pkgs.stdenv.hostPlatform.isx86;
+        # `qboot` comes out of `pkgsi686Linux` which is only available
+        # under the following condition:
+        default = with pkgs.stdenv.hostPlatform; isLinux && isx86;
         description = "Enable BIOS argument to qemu.";
       };
 
       path = mkOption {
         type = types.path;
-	default = "${pkgs.qboot}/bios.bin";
-	description = "BIOS binary path";
+	      default = "${pkgs.qboot}/bios.bin";
+	      description = "BIOS binary path";
       };
     };