diff options
| author | Raito Bezarius <masterancpp@gmail.com> | 2023-04-28 23:51:07 +0200 |
|---|---|---|
| committer | Raito Bezarius <masterancpp@gmail.com> | 2023-04-28 23:51:07 +0200 |
| commit | f9c4838812e06e69b14f214879fa3fcff4ddaf6d (patch) | |
| tree | e2bfe281849c4495f25631554747ef7f66cf0f17 /nixos/maintainers/scripts/ec2 | |
| parent | a22826f46a93ad5ab08fb2fbf859aa92a58dcc84 (diff) | |
| download | nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.tar nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.tar.gz nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.tar.bz2 nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.tar.lz nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.tar.xz nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.tar.zst nixpkgs-f9c4838812e06e69b14f214879fa3fcff4ddaf6d.zip | |
maintainers/scripts/ec2/amazon-image: use qemu_kvm (host arch) instead of qemu (all arches)
Diffstat (limited to 'nixos/maintainers/scripts/ec2')
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 0db0f4d0dcc..6f6bab8dc3d 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -102,8 +102,8 @@ in { ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${amiBootMode}" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ @@ -142,7 +142,7 @@ in { ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${amiBootMode}" \ --arg file "$diskImage" \ '{} |