Merge pull request #101473 from Ma27/nixos-build-vms-qemu
nixos/nixos-build-vms: use `pkgs.qemu` for virtualisation
This commit is contained in:
commit
48612c79b1
@ -6,7 +6,12 @@
|
||||
let
|
||||
nodes = builtins.mapAttrs (vm: module: {
|
||||
_file = "${networkExpr}@node-${vm}";
|
||||
imports = [ module ];
|
||||
imports = [
|
||||
module
|
||||
({ pkgs, ... }: {
|
||||
virtualisation.qemu.package = pkgs.qemu;
|
||||
})
|
||||
];
|
||||
}) (import networkExpr);
|
||||
in
|
||||
|
||||
|
@ -53,7 +53,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
|
||||
# or declare virtualisation.qemu.console option in a module that's always imported
|
||||
virtualisation.qemu = {
|
||||
consoles = lib.optional (options ? virtualisation.qemu.consoles) qemuSerialDevice;
|
||||
package = pkgs.qemu_test;
|
||||
package = lib.mkDefault pkgs.qemu_test;
|
||||
};
|
||||
|
||||
boot.initrd.preDeviceCommands =
|
||||
|
Loading…
Reference in New Issue
Block a user