fix local flake reference in module

LCOGT · Dec 15, 2023 · 8e0a8c4 · 8e0a8c4
1 parent 60e7d80
commit 8e0a8c4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/flake-module.nix b/flake-module.nix
@@ -5,9 +5,7 @@ localFlake:
     inputs.devenv.flakeModule
   ];
 
-  perSystem = { inputs', config, pkgs, ... }: {
-    packages.kpt = inputs'.kpt.packages.default;
-    packages.octopilot = inputs'.octopilot.packages.default;
+  perSystem = { system, pkgs, ... }: {
 
     devenv.shells.default = {
       name = "devenv-k8s";
@@ -27,10 +25,10 @@ localFlake:
         pkgs.kubernetes-helm
         pkgs.kustomize
         pkgs.jq
-
+      ] ++ localFlake.withSystem system ({config, ...}: [
         config.packages.kpt
         config.packages.octopilot
-      ];
+      ]);
     };
   };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -39,14 +39,23 @@
       flakeModules.default = importApply ./flake-module.nix { inherit withSystem; };
     in
     {
-      systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
-
       imports = [
         flakeModules.default
       ];
 
       flake = {
         inherit flakeModules;
       };
+
+      systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+
+      perSystem = { inputs', ...}: {
+
+        packages = {
+          kpt = inputs'.kpt.packages.default;
+          octopilot = inputs'.octopilot.packages.default;
+        };
+
+      };
     });
 }