1 files changed, 15 insertions, 5 deletions
diff --git a/modules/koboroot/default.nix b/modules/koboroot/default.nix
index 308ac6b..b0daf82 100644
--- a/modules/koboroot/default.nix
+++ b/modules/koboroot/default.nix
@@ -12,23 +12,33 @@ in {
 
     include = mkOption {
       default = [];
-      type = with types; listOf path;
+      type = with types; listOf (either path package);
     };
 
-    _allFiles = mkOption {
+    finalPackage = mkOption {
       type = types.package;
       readOnly = true;
       internal = true;
-      default = pkgs.buildEnv {
-        name = "koboroot-files";
+      default = pkgs.mergePaths {
+        name = "koboroot-package";
         paths = cfg.include;
       };
     };
+
+    # _allFiles = mkOption {
+    #   type = types.package;
+    #   readOnly = true;
+    #   internal = true;
+    #   default = pkgs.buildEnv {
+    #     name = "koboroot-files";
+    #     paths = cfg.include;
+    #   };
+    # };
   };
 
   config = {
     koboroot = {
-      include = mkBefore (mapAttrsToList (_: v: v._package));
+      include = mkBefore (mapAttrsToList (_: v: v._package) cfg.file);
     };
   };
 }