From a91803319b3d340ab9a879c11669e3e60d564572 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 4 Feb 2016 07:12:56 +0100 Subject: stockholm: bring back nspath --- default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 278f1d14d..b0ad60d8a 100644 --- a/default.nix +++ b/default.nix @@ -27,9 +27,10 @@ let stockholm = { nlib = import (slib.npath "lib"); klib = import (slib.kpath "4lib") { lib = nlib; }; slib = rec { + nspath = ns: p: ./. + "/${ns}/${p}"; npath = p: nixpkgs-path + "/${p}"; - kpath = p: ./. + "/krebs/${p}"; - upath = p: ./. + "/${current-user-name}/${p}"; + kpath = nspath "krebs"; + upath = nspath current-user-name; }; ulib = let p = slib.upath "4lib"; in nlib.optionalAttrs (klib.dir.has-default-nix p) -- cgit v1.2.3