From 124f4dc7ddf5ce1579b4aa6384cfa3a210b69125 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Jun 2010 06:56:12 +0000 Subject: [PATCH] * Doh. svn path=/nixpkgs/trunk/; revision=22289 --- pkgs/build-support/vm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 54046ee1894..c59b667d590 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -286,7 +286,7 @@ rec { createEmptyImage = {size, fullName}: '' mkdir $out diskImage=$out/disk-image.qcow2 - qemu-img create -f qcow2 $diskImage "${toString size}M" + ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M" mkdir $out/nix-support echo "${fullName}" > $out/nix-support/full-name @@ -373,7 +373,7 @@ rec { diskImage=$(pwd)/disk-image.qcow2 origImage=${attrs.diskImage} if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi - qemu-img create -b "$origImage" -f qcow2 $diskImage + ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage echo "$buildCommand" > cmd @@ -400,7 +400,7 @@ rec { diskImage=$(pwd)/disk-image.qcow2 origImage=${attrs.diskImage} if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi - qemu-img create -b "$origImage" -f qcow2 $diskImage + ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage ''; /* Inside the VM, run the stdenv setup script normally, but at the @@ -483,7 +483,7 @@ rec { fi diskImage="$1" if ! test -e "$diskImage"; then - qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" + ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" fi export TMPDIR=$(mktemp -d) export out=/dummy