Author: eelco Date: 2010-06-16 06:56:12 +0000 (Wed, 16 Jun 2010) New Revision: 22289
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22289&view=rev Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix Log: * Doh. Changes: Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/vm/default.nix 2010-06-16 06:33:47 UTC (rev 22288) +++ nixpkgs/trunk/pkgs/build-support/vm/default.nix 2010-06-16 06:56:12 UTC (rev 22289) @@ -286,7 +286,7 @@ 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 @@ 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 @@ 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 @@ 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 _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
