diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-20 07:11:57 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-20 07:29:29 +0000 |
| commit | 4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8 (patch) | |
| tree | 582af905a493b7dc92e5e624c7cadcf5fedc0134 | |
| parent | a567476380303fe0ccb0c136ad7e9a475ef53b1a (diff) | |
| download | spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.tar spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.tar.gz spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.tar.bz2 spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.tar.lz spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.tar.xz spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.tar.zst spectrum-4bf9f99dc3bb5e7a99060301dc4c2629db53b4b8.zip | |
Add missing development dependencies
The run-vm.nix outputs were missing a coreutils dependency, and img/live's shell.nix was missing qemu.
| -rw-r--r-- | img/combined/run-vm.nix | 3 | ||||
| -rw-r--r-- | img/installer/run-vm.nix | 7 | ||||
| -rw-r--r-- | img/live/shell.nix | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/img/combined/run-vm.nix b/img/combined/run-vm.nix index 3d6b0eb..e3419b2 100644 --- a/img/combined/run-vm.nix +++ b/img/combined/run-vm.nix @@ -8,11 +8,12 @@ let in writeShellScript "run-spectrum-installer-vm.sh" '' + export PATH=${lib.makeBinPath [ coreutils qemu_kvm ]} img="$(mktemp spectrum-installer-target.XXXXXXXXXX.img)" truncate -s 10G "$img" exec 3<>"$img" rm -f "$img" - exec ${qemu_kvm}/bin/qemu-kvm -cpu host -m 4G -machine q35 -snapshot \ + exec qemu-kvm -cpu host -m 4G -machine q35 -snapshot \ -display gtk,gl=on \ -device virtio-vga-gl \ -bios ${OVMF.fd}/FV/OVMF.fd \ diff --git a/img/installer/run-vm.nix b/img/installer/run-vm.nix index 5ec7fee..c39c5b6 100644 --- a/img/installer/run-vm.nix +++ b/img/installer/run-vm.nix @@ -5,8 +5,8 @@ let inherit (builtins) storeDir; - inherit (pkgs) OVMF qemu_kvm writeShellScript; - inherit (pkgs.lib) escapeShellArg; + inherit (pkgs) OVMF coreutils qemu_kvm writeShellScript; + inherit (pkgs.lib) makeBinPath escapeShellArg; eosimages = import ../combined/eosimages.nix { inherit pkgs; }; @@ -27,11 +27,12 @@ let in writeShellScript "run-spectrum-installer-vm.sh" '' + export PATH=${makeBinPath [ coreutils qemu_kvm ]} img="$(mktemp spectrum-installer-target.XXXXXXXXXX.img)" truncate -s 10G "$img" exec 3<>"$img" rm -f "$img" - exec ${qemu_kvm}/bin/.qemu-system-x86_64-wrapped -enable-kvm -cpu host -m 4G -machine q35 -snapshot \ + exec qemu-kvm -cpu host -m 4G -machine q35 -snapshot \ -display gtk,gl=on \ -device virtio-vga-gl \ -virtfs local,mount_tag=store,path=/nix/store,security_model=none,readonly=true \ diff --git a/img/live/shell.nix b/img/live/shell.nix index 66d273e..f602c2a 100644 --- a/img/live/shell.nix +++ b/img/live/shell.nix @@ -5,6 +5,8 @@ with pkgs; -(import ./. { inherit pkgs; }).overrideAttrs ({ ... }: { +(import ./. { inherit pkgs; }).overrideAttrs ({ nativeBuildInputs ? [], ... }: { + nativeBuildInputs = nativeBuildInputs ++ [ qemu_kvm ]; + OVMF_FD = "${OVMF.fd}/FV/OVMF.fd"; }) |