diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-19 18:44:02 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-19 18:44:02 +0000 |
| commit | 9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5 (patch) | |
| tree | d894f01964e663cf18c5b8a5a8be218c7943c3d8 /pkgs/build-support | |
| parent | f92ee1a13dbd0cd2067ffc6650d2f4c899eb6ab9 (diff) | |
| download | nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.tar nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.tar.gz nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.tar.bz2 nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.tar.lz nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.tar.xz nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.tar.zst nixlib-9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5.zip | |
* Pass -cpu kvm64 to keep GMP from barfing.
svn path=/nixpkgs/trunk/; revision=33848
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2f8afb1f3889..b2fd4db4e75f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -211,7 +211,8 @@ rec { qemuCommandLinux = '' - ${kvm}/bin/qemu-system-x86_64 \ + ${kvm}/bin/qemu-kvm \ + ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ -net nic,model=virtio \ -chardev socket,id=samba,path=./samba \ @@ -407,7 +408,7 @@ rec { qemuCommandGeneric = '' PATH="${samba}/sbin:$PATH" \ - ${kvm}/bin/qemu-system-x86_64 \ + ${kvm}/bin/qemu-kvm \ -nographic -no-reboot \ -smb $(pwd) -hda $diskImage \ $QEMU_OPTS |