HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

squashfs builder just needs filesystem not entire config

Browse source
This commit is contained in:
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>
./modules/s6
] nixpkgs.pkgs;
squashfs = liminix.builders.squashfs config;
squashfs = liminix.builders.squashfs config.filesystem.contents;
kernel = callPackage ./kernel {
inherit (config.kernel) config;
};

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

@ -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