Author: eelco
Date: Thu Apr 19 18:44:02 2012
New Revision: 33848
URL: https://nixos.org/websvn/nix/?rev=33848&sc=1
Log:
* Pass -cpu kvm64 to keep GMP from barfing.
Modified:
nixpkgs/trunk/pkgs/build-support/vm/default.nix
Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/vm/default.nix Thu Apr 19 18:39:58
2012 (r33847)
+++ nixpkgs/trunk/pkgs/build-support/vm/default.nix Thu Apr 19 18:44:02
2012 (r33848)
@@ -211,7 +211,8 @@
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 @@
qemuCommandGeneric = ''
PATH="${samba}/sbin:$PATH" \
- ${kvm}/bin/qemu-system-x86_64 \
+ ${kvm}/bin/qemu-kvm \
-nographic -no-reboot \
-smb $(pwd) -hda $diskImage \
$QEMU_OPTS
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
