Fix libS input (again)
This commit is contained in:
parent
3698a8baf6
commit
b10523c86d
|
@ -15,15 +15,13 @@
|
|||
ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
|
||||
in
|
||||
{
|
||||
nixosModule = { config, ... }@args: {
|
||||
_module.args = lib.optionalAttrs (!args ? libS) {
|
||||
libS = nixos-modules.lib { inherit lib config; };
|
||||
};
|
||||
nixosModule = { config, libS, ... }@args: {
|
||||
_module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
|
||||
|
||||
imports = (dir: map
|
||||
(file: ./. + "/${dir}/${file}")
|
||||
# assume that the nixos-modules repo is already imported if libS exists
|
||||
(lib.remove (lib.optionalString (!args ? libs) "default.nix") (ls dir))
|
||||
(lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir))
|
||||
) "modules";
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user