Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stockholm: check harder if user lib exists

Browse Source
This commit is contained in:
tv 2015-11-09 19:10:45 +01:00
parent e5f1bdea02
commit 9cfc10a1ec
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default.nix
View File

@ -19,8 +19,9 @@ let stockholm = {
klib = import ./krebs/4lib { inherit lib; }; klib = import ./krebs/4lib { inherit lib; };
ulib = let ulib = let
path = ./. + "/${current-user-name}/4lib"; path = ./. + "/${current-user-name}/4lib";
in lib.optionalAttrs (klib.dir.has-default-nix path) in lib.optionalAttrs
(import path { lib = lib // klib; }); (builtins.pathExists path && klib.dir.has-default-nix path)
(import path { lib = lib // klib; });
in in
builtins // lib // klib // ulib // rec { builtins // lib // klib // ulib // rec {
# TODO move this stuff # TODO move this stuff