spectrumPackages: export makeRootfs

We'll want service VMs to be able to call this themselves to construct
their own root filesystems.

Message-Id: <20210411115740.29615-8-hi@alyssa.is>
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>

2 files changed, 5 insertions, 10 deletions

diff --git a/pkgs/os-specific/linux/spectrum/default.nix b/pkgs/os-specific/linux/spectrum/default.nix
index ea4fa902e95..ea86dc25c2b 100644
--- a/pkgs/os-specific/linux/spectrum/default.nix
+++ b/pkgs/os-specific/linux/spectrum/default.nix
@@ -8,6 +8,8 @@ let
 
     linux_vm = callPackage ./linux/vm.nix { linux = linux_cros; };
 
+    makeRootfs = callPackage ./rootfs/generic.nix { };
+
     rootfs = callPackage ./rootfs { };
   };
 in
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/default.nix b/pkgs/os-specific/linux/spectrum/rootfs/default.nix
index cd1cccc1a87..6f46ad8054b 100644
--- a/pkgs/os-specific/linux/spectrum/rootfs/default.nix
+++ b/pkgs/os-specific/linux/spectrum/rootfs/default.nix
@@ -1,16 +1,9 @@
-{ runCommandNoCC, writeScript, writeText, makeFontsConf, writeReferencesToFile
-, lib, dash, busybox, execline, s6, s6-portable-utils, s6-linux-utils
-, s6-linux-init, mesa, squashfs-tools-ng
-, source-code-pro, zsh, emacs26-nox, gcc, wayfire, sommelier, westonLite
+{ writeScript, writeText, lib, makeRootfs
+, busybox, execline, s6, sommelier, source-code-pro, wayfire, zsh
+, gcc, emacs26-nox, westonLite
 }:
 
 let
-  makeRootfs = import ./generic.nix {
-    inherit runCommandNoCC writeScript writeReferencesToFile makeFontsConf lib
-      dash execline s6 s6-portable-utils s6-linux-utils s6-linux-init busybox
-      mesa squashfs-tools-ng;
-  };
-
   path = [
     zsh emacs26-nox gcc wayfire sommelier westonLite busybox s6 execline
   ];