diff --git a/default.nix b/default.nix index 71c243f..9f1696d 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,7 @@ let ./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 index f5fc875..4ba9a26 100644 --- 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 { # 1) Every required package is referenced from somewhere