diff options
| author | pennae <82953136+pennae@users.noreply.github.com> | 2022-09-01 16:10:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 16:10:09 +0200 |
| commit | 3bddcf5f9002814a8bec50025418faa3fd3f6138 (patch) | |
| tree | 5ae3ebf10acce3ad00d4a2468f8e64c41a2c749b /lib/modules.nix | |
| parent | 1d41cff3dc4c8f37bb5841f51fcbff705e169178 (diff) | |
| parent | e7312d54f184e5c3e0f1ef29028f6dae8fa34a97 (diff) | |
Merge branch 'master' into option-docs-md
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 659f1dd75dd1a..d3a7fac82c4ab 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -399,7 +399,9 @@ rec { # modules recursively. It returns the final list of unique-by-key modules filterModules = modulesPath: { disabled, modules }: let - moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m; + moduleKey = m: if isString m && (builtins.substring 0 1 m != "/") + then toString modulesPath + "/" + m + else toString m; disabledKeys = map moduleKey disabled; keyFilter = filter (attrs: ! elem attrs.key disabledKeys); in map (attrs: attrs.module) (builtins.genericClosure { |