callPackageify make-image.nix

2022-09-26 16:19:14 +01:00
parent c6c6b51893
commit 1c14bb63fa
2 changed files with 26 additions and 23 deletions
--- a/default.nix
+++ b/default.nix
@@ -10,12 +10,11 @@ let
    <liminix-config>
  ] nixpkgs.pkgs;
  finalConfig = config // {
-    packages = (with nixpkgs.pkgs; [ s6-rc ]) ++
+    packages = (with nixpkgs.pkgs; [ s6-init-files s6-rc ]) ++
               config.systemPackages ++
-               (builtins.attrValues config.services)
-    ;
+               (builtins.attrValues config.services);
  };
-  squashfs = (import ./make-image.nix) nixpkgs finalConfig;
+  squashfs = (nixpkgs.pkgs.callPackage ./make-image.nix {}) finalConfig;
  kernel = nixpkgs.pkgs.callPackage ./kernel {
    inherit (finalConfig.kernel) config;
  };