* Pass -cpu kvm64 to keep GMP from barfing.

svn path=/nixpkgs/trunk/; revision=33848
This commit is contained in:
Eelco Dolstra 2012-04-19 18:44:02 +00:00
parent f92ee1a13d
commit 9aa30ba705

View file

@ -211,7 +211,8 @@ rec {
qemuCommandLinux = '' qemuCommandLinux = ''
${kvm}/bin/qemu-system-x86_64 \ ${kvm}/bin/qemu-kvm \
${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
-nographic -no-reboot \ -nographic -no-reboot \
-net nic,model=virtio \ -net nic,model=virtio \
-chardev socket,id=samba,path=./samba \ -chardev socket,id=samba,path=./samba \
@ -407,7 +408,7 @@ rec {
qemuCommandGeneric = '' qemuCommandGeneric = ''
PATH="${samba}/sbin:$PATH" \ PATH="${samba}/sbin:$PATH" \
${kvm}/bin/qemu-system-x86_64 \ ${kvm}/bin/qemu-kvm \
-nographic -no-reboot \ -nographic -no-reboot \
-smb $(pwd) -hda $diskImage \ -smb $(pwd) -hda $diskImage \
$QEMU_OPTS $QEMU_OPTS