dan
/
liminix
1
0
Fork 5
Code Issues 3 Pull Requests 2 Projects Releases Wiki Activity

squashfs builder just needs filesystem not entire config

module-based-network
Daniel Barlow 2022-09-27 22:06:36 +01:00
parent e2650aa162
commit 5e573cef09
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -11,7 +11,7 @@ let
<liminix-config> <liminix-config>
./modules/s6 ./modules/s6
] nixpkgs.pkgs; ] nixpkgs.pkgs;
squashfs = liminix.builders.squashfs config; squashfs = liminix.builders.squashfs config.filesystem.contents;
kernel = callPackage ./kernel { kernel = callPackage ./kernel {
inherit (config.kernel) config; inherit (config.kernel) config;
}; };

5
pkgs/liminix-tools/builders/squashfs.nix
View File

@ -6,10 +6,9 @@
, pseudofile , pseudofile
, runCommand , runCommand
, writeText , writeText
} : config : } : filesystem :
let let
pseudofiles = pseudofiles = pseudofile.write "files.pf" filesystem;
pseudofile.write "files.pf" (config.filesystem.contents);
storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> { storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> {
# 1) Every required package is referenced from somewhere # 1) Every required package is referenced from somewhere