diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-06 20:26:22 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-30 16:57:27 +0200 |
| commit | 71631a922b4005497fe3b93fdfe5899e2f6d7a2c (patch) | |
| tree | f894da583f2973a0959df8da2bc28d114db5efe3 /pkgs/build-support/vm | |
| parent | 8c4f8c51a640e169484e4513b62d50844b2ed779 (diff) | |
| download | nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.tar nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.tar.gz nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.tar.bz2 nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.tar.lz nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.tar.xz nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.tar.zst nixpkgs-71631a922b4005497fe3b93fdfe5899e2f6d7a2c.zip | |
runInLinuxVM: Use QEMU command line that works on other architectures
... by moving the existing definition to qemu-flags.nix and reusing that.
Diffstat (limited to 'pkgs/build-support/vm')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cf6e7cc1fe4..d599f9bbb65 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -23,8 +23,6 @@ rec { patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ]; }); - qemuProg = "${qemu}/bin/qemu-kvm"; - modulesClosure = makeModulesClosure { inherit kernel rootModules; @@ -204,8 +202,7 @@ rec { qemuCommandLinux = '' - ${qemuProg} \ - ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ + ${qemuBinary qemu} \ -nographic -no-reboot \ -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ |