From 28e8af60cf4ba996a420fa6c194681337c1ff797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 4 Apr 2024 13:30:42 +0200 Subject: [PATCH] flake-parts: fix clan-core reference --- flake.nix | 2 +- flakeModules/clan.nix | 6 +++--- flakeModules/flake-module.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 9624f241..343c23d2 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ ./checks/flake-module.nix ./clanModules/flake-module.nix ./flakeModules/flake-module.nix - ./flakeModules/clan.nix + (import ./flakeModules/clan.nix inputs.self) ./devShell.nix ./docs/flake-module ./formatter.nix diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix index 83067944..4df243ae 100644 --- a/flakeModules/clan.nix +++ b/flakeModules/clan.nix @@ -1,16 +1,15 @@ +clan-core: { config, lib, flake-parts-lib, inputs, - self, ... }: let inherit (lib) mkOption types; buildClan = import ../lib/build-clan { - inherit lib; - clan-core = self; + inherit lib clan-core; inherit (inputs) nixpkgs; }; @@ -70,4 +69,5 @@ in ; }; }; + _file = __curPos.file; } diff --git a/flakeModules/flake-module.nix b/flakeModules/flake-module.nix index fc336da1..bd840e51 100644 --- a/flakeModules/flake-module.nix +++ b/flakeModules/flake-module.nix @@ -1,7 +1,7 @@ -{ config, ... }: +{ self, config, ... }: { flake.flakeModules = { - clan = ./clan.nix; + clan = import ./clan.nix self; default = config.flake.flakeModules.clan; }; }