stockholm: import user lib if it exists

This commit is contained in:
tv 2015-11-09 18:52:11 +01:00
parent 85c25d6947
commit 1f39b86dad
2 changed files with 6 additions and 3 deletions

View File

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

View File

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
with import ../4lib { inherit lib pkgs; };
with lib;
let
out = {