diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/pkgs/build-support/vm | |
parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/build-support/vm')
-rw-r--r-- | nixpkgs/pkgs/build-support/vm/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/vm/default.nix b/nixpkgs/pkgs/build-support/vm/default.nix index f6baa42348ab..4ec5531192dc 100644 --- a/nixpkgs/pkgs/build-support/vm/default.nix +++ b/nixpkgs/pkgs/build-support/vm/default.nix @@ -494,7 +494,7 @@ rec { fi diskImage="$1" if ! test -e "$diskImage"; then - ${qemu}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" + ${qemu}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 -F qcow2 "$diskImage" fi export TMPDIR=$(mktemp -d) export out=/dummy |