diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-04 12:01:14 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-04 12:01:14 +0100 |
| commit | 4ab103ba475b0add519054772f2ff3b542184466 (patch) | |
| tree | 17f0005251a2d11e8fe67325453f63707491ecc6 /default.nix | |
| parent | e89f43de944af3751b7a70de87e3cc0c1860f2bd (diff) | |
| parent | 07a1e29b32f1c507380a252092ff85b1e69dec08 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 5 |
1 files 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) |