mirror of
https://github.com/nix-community/flakelight.git
synced 2024-11-25 17:03:14 +01:00
Skip default.nix in loadNixDir
This will allow a default.nix to use loadNixDir to load its directory.
This commit is contained in:
parent
426480067c
commit
ec3ce2b4aa
@ -281,12 +281,13 @@ let
|
||||
loadNixDir = path: genAttrs
|
||||
(pipe (readDir path) [
|
||||
attrNames
|
||||
(filter (s: s != "default.nix"))
|
||||
(filter (hasSuffix ".nix"))
|
||||
(map (removeSuffix ".nix"))
|
||||
(map (removePrefix "+"))
|
||||
])
|
||||
(p: import (path +
|
||||
(if pathExists (path + "/${p}.nix") then "/${p}.nix" else "/+${p}.nix")));
|
||||
(p: import (path + (if pathExists
|
||||
(path + "/+${p}.nix") then "/+${p}.nix" else "/${p}.nix")));
|
||||
|
||||
systems = rec {
|
||||
linuxDefault = [
|
||||
|
Loading…
Reference in New Issue
Block a user