diff options
| -rw-r--r-- | host/start-vm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/default.nix | 1 | ||||
| -rw-r--r-- | release/checks/start-vm.nix | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/host/start-vm/default.nix b/host/start-vm/default.nix index 9a7440e..1777d8a 100644 --- a/host/start-vm/default.nix +++ b/host/start-vm/default.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2022-2023 Alyssa Ross <hi@alyssa.is> import ../../lib/call-package.nix ( -{ src, lib, stdenv, meson, ninja, rustc, clippy }: +{ src, lib, stdenv, meson, ninja, rustc, clippy, run-spectrum-vm }: stdenv.mkDerivation (finalAttrs: { name = "start-vm"; @@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: { postBuild = ''touch $out && exit 0''; } ); + + run = run-spectrum-vm.override { start-vm = finalAttrs.finalPackage; }; }; meta = { diff --git a/pkgs/default.nix b/pkgs/default.nix index 0d4091f..ed2762d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -30,6 +30,7 @@ let lseek = self.callSpectrumPackage ../tools/lseek {}; rootfs = self.callSpectrumPackage ../host/rootfs {}; start-vm = self.callSpectrumPackage ../host/start-vm {}; + run-spectrum-vm = self.callSpectrumPackage ../scripts/run-spectrum-vm.nix {}; # Packages from the overlay, so it's possible to build them from # the CLI easily. diff --git a/release/checks/start-vm.nix b/release/checks/start-vm.nix deleted file mode 100644 index ec24f4b..0000000 --- a/release/checks/start-vm.nix +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is> - -import ../../lib/call-package.nix ( -{ callSpectrumPackage, runCommand }: - -runCommand "start-vm-test" {} '' - ${callSpectrumPackage ../../scripts/run-spectrum-vm.nix {}} > $out -'') (_: {}) |