default out: use nspath in namespace loader

2015-10-17 07:25:10 +02:00 · 2015-10-17 07:25:10 +02:00 · aa094e2b81
parent 4e4e169646
commit aa094e2b81
1 changed files with 3 additions and 3 deletions
--- a/default.nix
+++ b/default.nix
@ -27,9 +27,9 @@ let
    { inherit (eval {}) config options pkgs; } //
    lib.mapAttrs
      (name: _:
-        if builtins.pathExists (./. + "/${name}/default.nix")
-          then import (./. + "/${name}")
-          else import-1systems (./. + "/${name}/1systems"))
+        if builtins.pathExists (nspath name "default.nix")
+          then import (nspath name "default.nix")
+          else import-1systems (nspath name "1systems"))
      (lib.filterAttrs
        (n: t: !lib.hasPrefix "." n && t == "directory")
        (builtins.readDir ./.));