diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-04 18:30:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-05 00:17:03 +0200 |
| commit | ed37a6b465cb75d86ecf2265a8a8869717e05739 (patch) | |
| tree | bfd1c32a109ad101520e7b3c84fc6354766b180f /pkgs/build-support | |
| parent | 72359433d01c1fdce5745d648ab1bf6ea1dd5fac (diff) | |
| download | nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.tar nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.tar.gz nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.tar.bz2 nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.tar.lz nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.tar.xz nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.tar.zst nixlib-ed37a6b465cb75d86ecf2265a8a8869717e05739.zip | |
VM builds: Use qemu instead of the obsolete qemu-kvm
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b1eb82ed8303..492c7f3e8187 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -16,7 +16,9 @@ rec { # in parallel). So apply a patch to increase the timeout to 120s. kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel; - kvm = pkgs.qemu_kvm; + kvm = pkgs.qemu; + + qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386"); modulesClosure = makeModulesClosure { @@ -195,7 +197,8 @@ rec { qemuCommandLinux = '' - ${kvm}/bin/qemu-kvm \ + ${qemuProg} \ + -enable-kvm \ ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ -net nic,model=virtio \ @@ -393,7 +396,8 @@ rec { qemuCommandGeneric = '' PATH="${samba}/sbin:$PATH" \ - ${kvm}/bin/qemu-kvm \ + ${qemuProg} \ + -enable-kvm \ -nographic -no-reboot \ -smb $(pwd) -hda $diskImage \ $QEMU_OPTS |