summary refs log tree commit diff
path: root/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-10 21:46:54 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-14 23:38:56 +0000
commitc643e387ff1f048779b4c73bba60dae3bda84921 (patch)
tree9f7fb21ce447cc49f6214e43e38d16adcd985782 /pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix
parente73506be2a29a29c6507285393aec81181061cb1 (diff)
downloadnixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.tar
nixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.tar.gz
nixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.tar.bz2
nixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.tar.lz
nixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.tar.xz
nixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.tar.zst
nixpkgs-c643e387ff1f048779b4c73bba60dae3bda84921.zip
spectrumPackages.sys-vms.comp: init
This removes the default rootfs, and creates a VM called "comp" that
runs all the Wayfire stuff the default rootfs did previously.

This is in a new namespace called sys-vms, which I have a very vague
intention of being a place to put VMs that run system services like a
Wayland compositor or hardware drivers.  I don't think this will be
the final structure, but it's _a_ structure that supports more than
one VM, so it's an improvement over what we had before.

Message-Id: <20210411115740.29615-13-hi@alyssa.is>
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
Diffstat (limited to 'pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix')
-rw-r--r--pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix b/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix
index 56f1eadea99..c56d2537c63 100644
--- a/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix
+++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, utillinux, crosvm, linux, rootfs }:
+{ stdenv, lib, makeWrapper, utillinux, crosvm, linux, sys-vms }:
 
 stdenv.mkDerivation {
   name = "spectrum-vm";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
 
   getopt = "${lib.getBin utillinux}/bin/getopt";
   crosvm = "${lib.getBin crosvm}/bin/crosvm";
-  kernel = "${linux}/bzImage";
-  rootfs = rootfs.squashfs;
+  kernel = "${sys-vms.comp.linux}/bzImage";
+  rootfs = sys-vms.comp.rootfs.squashfs;
 
   installPhase = ''
     mkdir -p $out/bin