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 = { };
|
default = { };
|
||||||
type = types.submoduleWith {
|
type = types.submoduleWith {
|
||||||
class = "clan";
|
class = "clan";
|
||||||
specialArgs = {
|
specialArgs =
|
||||||
inherit self;
|
# TODO: make these explizit options and deduplicate with lib.clan function
|
||||||
inherit (inputs) nixpkgs nix-darwin;
|
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 = [
|
modules = [
|
||||||
clan-core.modules.clan.default
|
clan-core.modules.clan.default
|
||||||
];
|
];
|
||||||
|
|||||||
Reference in New Issue
Block a user