liminix

commit 5e573cef090cac8561688d01e0de8f8d07dbcdc9
parent e2650aa1629d9859473c07e54a50c797e58fee49
Author: Daniel Barlow <dan@telent.net>
Date:   Tue, 27 Sep 2022 22:06:36 +0100

squashfs builder just needs filesystem not entire config

Diffstat:
M
default.nix
 | 
2
+-
M
pkgs/liminix-tools/builders/squashfs.nix
 | 
5
++---

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/default.nix b/default.nix
@@ -11,7 +11,7 @@ let
     <liminix-config>
     ./modules/s6
   ] nixpkgs.pkgs;
-  squashfs = liminix.builders.squashfs config;
+  squashfs = liminix.builders.squashfs config.filesystem.contents;
   kernel = callPackage ./kernel {
     inherit (config.kernel) config;
   };
diff --git a/pkgs/liminix-tools/builders/squashfs.nix b/pkgs/liminix-tools/builders/squashfs.nix
@@ -6,10 +6,9 @@
 , pseudofile
 , runCommand
 , writeText
-} : config :
+} : filesystem :
 let
-  pseudofiles =
-    pseudofile.write "files.pf" (config.filesystem.contents);
+  pseudofiles = pseudofile.write "files.pf" filesystem;
 
   storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> {
     # 1) Every required package is referenced from somewhere