diff options
author | tv <tv@krebsco.de> | 2016-02-04 04:35:39 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-02-04 04:35:39 +0100 |
commit | 8e3d27a9499bb70d5d033e4fd007aa53dea70b18 (patch) | |
tree | dcee19b760cfa800a635e8dfbfe5653c38781b80 | |
parent | db0e7dfe82fbed065afb16f41b46900767d69a96 (diff) |
stockholm: add slib.npath
-rw-r--r-- | default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/default.nix b/default.nix index b2b57ea4c..9dd18a235 100644 --- a/default.nix +++ b/default.nix @@ -14,12 +14,12 @@ let stockholm = { krebs = import ./krebs (args // { inherit lib stockholm; }); lib = let - nlib = import <nixpkgs/lib>; + nlib = import (slib.npath "lib"); klib = import (slib.kpath "4lib") { lib = nlib; }; slib = rec { - nspath = ns: p: ./. + "/${ns}/${p}"; - kpath = nspath "krebs"; - upath = nspath current-user-name; + npath = p: <nixpkgs> + "/${p}"; + kpath = p: ./. + "/krebs/${p}"; + upath = p: ./. + "/${current-user-name}/${p}"; }; ulib = let p = slib.upath "4lib"; in nlib.optionalAttrs (klib.dir.has-default-nix p) @@ -44,7 +44,7 @@ let stockholm = { in kpkgs // upkgs; }; - eval = config: import <nixpkgs/nixos/lib/eval-config.nix> { + eval = config: import (lib.npath "nixos/lib/eval-config.nix") { specialArgs = { inherit lib; }; |