Merge pull request 'modules/clan: consistent logic for auto injecting nixpkgs, nix-darwin' (#4117) from hsjobeki/fix-clan.nix into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4117
This commit is contained in:
@@ -27,10 +27,16 @@ in
|
||||
default = { };
|
||||
type = types.submoduleWith {
|
||||
class = "clan";
|
||||
specialArgs = {
|
||||
inherit self;
|
||||
inherit (inputs) nixpkgs nix-darwin;
|
||||
};
|
||||
specialArgs =
|
||||
# TODO: make these explizit options and deduplicate with lib.clan function
|
||||
let
|
||||
nixpkgs = inputs.nixpkgs or clan-core.inputs.nixpkgs;
|
||||
nix-darwin = inputs.nix-darwin or clan-core.inputs.nix-darwin;
|
||||
in
|
||||
{
|
||||
inherit self;
|
||||
inherit nixpkgs nix-darwin;
|
||||
};
|
||||
modules = [
|
||||
clan-core.modules.clan.default
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user