modules.clan.default: move specialArgs into common place

This commit is contained in:
Johannes Kirschbauer
2025-06-26 17:32:51 +02:00
parent a35e2d84d1
commit e9600a19c1
6 changed files with 5 additions and 17 deletions

View File

@@ -1,8 +1,6 @@
{
lib,
self,
nixpkgs,
nix-darwin ? null,
...
}:
# Produces the
@@ -14,7 +12,6 @@ lib.fix (
buildClanLib = (
clanLib.callLib ./modules {
clan-core = self;
inherit nixpkgs nix-darwin;
}
);
in

View File

@@ -16,7 +16,6 @@ rec {
];
flake.clanLib = import ./default.nix {
inherit lib inputs self;
inherit (inputs) nixpkgs nix-darwin;
};
# TODO: remove this legacy alias
flake.lib = flake.clanLib;

View File

@@ -4,6 +4,8 @@
_module.args = {
inherit clan-core;
inherit (clan-core) clanLib;
# TODO: This should be set via an option otherwise it is not possible to override
inherit (clan-core.inputs) nixpkgs nix-darwin;
};
imports = [
./module.nix

View File

@@ -2,10 +2,8 @@
## This is only a wrapper such that 'clan' can be called as a function.
{
lib,
clanLib,
clan-core,
nixpkgs,
nix-darwin,
...
}:
rec {
buildClan =
@@ -18,12 +16,8 @@ rec {
}@m:
lib.evalModules {
specialArgs = {
inherit (clan-core) clanLib;
inherit
self
clan-core
nixpkgs
nix-darwin
;
};
modules = [