Merge pull request 'Revert "clan: Remove pkgsForSystem"' (#2376) from Qubasa/clan-core:Qubasa-main into main

lib/build-clan/interface.nix

@@ -3,7 +3,6 @@ let
   types = lib.types;
 in
 {
-
   options = {
     # Required options
     directory = lib.mkOption {
@@ -70,6 +69,18 @@ in
       default = { };
     };
 
+    pkgsForSystem = lib.mkOption {
+      type = types.functionTo (types.nullOr types.attrs);
+      default = _: null;
+      defaultText = "Lambda :: String -> { ... } | null";
+      description = ''
+        A function that maps from architecture to pkg. `( string -> pkgs )`
+
+        If specified this nixpkgs will be only imported once for each system.
+        This improves performance, but all nipxkgs.* options will be ignored.
+      '';
+    };
+
     # Outputs
     nixosConfigurations = lib.mkOption {
       # Hide from documentation.
@@ -101,5 +112,4 @@ in
       };
     };
   };
-
 }

lib/build-clan/module.nix

@@ -9,6 +9,7 @@ let
   inherit (config)
     directory
     machines
+    pkgsForSystem
     specialArgs
     ;
 
@@ -57,7 +58,7 @@ let
               # Settings
               clan.core.clanDir = directory;
               # Inherited from clan wide settings
-              # TODO: remove these`
+              # TODO: remove these
               clan.core.name = config.inventory.meta.name;
               clan.core.icon = config.inventory.meta.icon;
 
@@ -126,7 +127,7 @@ let
             args
             // {
               inherit name system;
-              pkgs = nixpkgs.legacyPackages.${system};
+              pkgs = pkgsForSystem system;
             }
           )
         ) allMachines