diff options
| author | tv <tv@krebsco.de> | 2015-11-09 19:10:45 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-11-09 19:10:45 +0100 |
| commit | 9cfc10a1ec6674dde1905a5fedc4bcb56185271b (patch) | |
| tree | 07c1a0f26c4eba2eed3ef3138675b2add20a8864 | |
| parent | e5f1bdea02c9f9c9e0eac1c54f55094878ad7af3 (diff) | |
stockholm: check harder if user lib exists
| -rw-r--r-- | default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/default.nix b/default.nix index d62e43a1f..78923110a 100644 --- a/default.nix +++ b/default.nix @@ -19,8 +19,9 @@ let stockholm = { klib = import ./krebs/4lib { inherit lib; }; ulib = let path = ./. + "/${current-user-name}/4lib"; - in lib.optionalAttrs (klib.dir.has-default-nix path) - (import path { lib = lib // klib; }); + in lib.optionalAttrs + (builtins.pathExists path && klib.dir.has-default-nix path) + (import path { lib = lib // klib; }); in builtins // lib // klib // ulib // rec { # TODO move this stuff |