extern/flakelight
1
0
Fork 1
mirror of https://github.com/nix-community/flakelight.git synced 2025-06-21 01:57:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow root module to be a function

Browse Source
This commit is contained in:
Archit Gupta 2023-04-20 18:19:33 -07:00
parent ef5d482ea6
commit 76eb12e51b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default.nix
View File

@ -339,8 +339,9 @@ let
# Root module with autoloads, normalization, and additional attrs. # Root module with autoloads, normalization, and additional attrs.
root' = root' =
let let
nixDir = root.nixDir or (src + ./nix); resolvedRoot = applyNonSysArgs root;
fullRoot = (autoImportAttrs nixDir rootAttrs) // root; nixDir = resolvedRoot.nixDir or (src + ./nix);
fullRoot = (autoImportAttrs nixDir rootAttrs) // resolvedRoot;
in in
normalizeModule fullRoot // { normalizeModule fullRoot // {
modules = fullRoot.modules or modules = fullRoot.modules or
@ -352,7 +353,6 @@ let
perSystem = filterArgs (fullRoot.perSystem or { }); perSystem = filterArgs (fullRoot.perSystem or { });
outputs = applyNonSysArgs (fullRoot.outputs or { }); outputs = applyNonSysArgs (fullRoot.outputs or { });
inherit nixDir; inherit nixDir;
raw = root;
}; };
modules = [ baseModule ] ++ builtinModules ++ root'.modules; modules = [ baseModule ] ++ builtinModules ++ root'.modules;