diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2020-10-21 13:02:09 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2020-10-21 16:38:04 +0200 |
| commit | bc2188b083dfbbe749a221023e2960b60d4c8951 (patch) | |
| tree | 2919676a86fbd3a7c08819d07a4c0a40320107a8 /nixos/modules/virtualisation | |
| parent | d95b8c33b4b076305cc3479885ff1cab54ca290c (diff) | |
| download | nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.tar nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.tar.gz nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.tar.bz2 nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.tar.lz nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.tar.xz nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.tar.zst nixpkgs-bc2188b083dfbbe749a221023e2960b60d4c8951.zip | |
nixos: fix qemu_test being used in normal VMs
This is an attempt to fixup PR #49403.
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 42e43f5ee02..191d7c758c0 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -14,10 +14,11 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; let - qemu = config.system.build.qemu or pkgs.qemu_test; cfg = config.virtualisation; + qemu = cfg.qemu.package; + consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; driveOpts = { ... }: { @@ -401,6 +402,14 @@ in }; virtualisation.qemu = { + package = + mkOption { + type = types.package; + default = pkgs.qemu; + example = "pkgs.qemu_test"; + description = "QEMU package to use."; + }; + options = mkOption { type = types.listOf types.unspecified; |