From 6f325f7de9c9fd6bb917090c2763b67e37eb26f3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 19:12:35 +0100
Subject: Revert "stockholm: check harder if user lib exists"

This reverts commit 9cfc10a1ec6674dde1905a5fedc4bcb56185271b.
---
 default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 78923110..d62e43a1 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
-- 
cgit v1.2.3