summaryrefslogtreecommitdiffstats
path: root/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2015-11-09 19:12:35 +0100
committertv <tv@krebsco.de>2015-11-09 19:12:35 +0100
commit6f325f7de9c9fd6bb917090c2763b67e37eb26f3 (patch)
treec45a621da063415e14f0fc95af94d7e40fe16a95 /default.nix
parent9cfc10a1ec6674dde1905a5fedc4bcb56185271b (diff)
Revert "stockholm: check harder if user lib exists"
This reverts commit 9cfc10a1ec6674dde1905a5fedc4bcb56185271b.
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/default.nix b/default.nix
index 78923110a..d62e43a1f 100644
--- a/default.nix
+++ b/default.nix
@@ -19,9 +19,8 @@ let stockholm = {
klib = import ./krebs/4lib { inherit lib; };
ulib = let
path = ./. + "/${current-user-name}/4lib";
- in lib.optionalAttrs
- (builtins.pathExists path && klib.dir.has-default-nix path)
- (import path { lib = lib // klib; });
+ in lib.optionalAttrs (klib.dir.has-default-nix path)
+ (import path { lib = lib // klib; });
in
builtins // lib // klib // ulib // rec {
# TODO move this stuff