summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatthewcroughan <matt@croughan.sh>2024-07-08 16:40:01 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-09-27 09:36:44 +0000
commitfabcbb01c5f6e500a615bbb1b425f7b74777dd9f (patch)
tree14e5b9821214bb9a76f3063e9c25512dac4b1bd1
parentnixos/influxdb2: wait until service is ready (diff)
downloadnixpkgs-origin/backport-325619-to-release-24.05.tar.gz
vmTools: allow qemu to be overridden via customQemu argumentorigin/backport-325619-to-release-24.05
(cherry picked from commit 65c851cd7523c669b8fb25236b1c48283a2f43ec)
-rw-r--r--pkgs/build-support/vm/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 871f81bb5d69..7ba67af5cf5a 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,5 +1,6 @@
{ lib
, pkgs
+, customQemu ? null
, kernel ? pkgs.linux
, img ? pkgs.stdenv.hostPlatform.linux-kernel.target
, storeDir ? builtins.storeDir
@@ -218,7 +219,7 @@ rec {
qemuCommandLinux = ''
- ${qemu-common.qemuBinary qemu} \
+ ${if (customQemu != null) then customQemu else (qemu-common.qemuBinary qemu)} \
-nographic -no-reboot \
-device virtio-rng-pci \
-virtfs local,path=${storeDir},security_model=none,mount_tag=store \