From 8e5f03bd71b6181be5b4f352f49bdd6b9ca2dc07 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 27 Jun 2025 10:23:53 +0200 Subject: [PATCH] modules/clan: consistent logic for auto injecting nixpkgs, nix-darwin We want to make them options this is a temporary fix --- flakeModules/clan.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix index d42d1ef1b..9ce2bff9a 100644 --- a/flakeModules/clan.nix +++ b/flakeModules/clan.nix @@ -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 ];