From be5f4833fe1dc3ec4acb24eeb5a6670c2aaef2e0 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 12 Oct 2021 22:08:07 +0200 Subject: pkgs: import relative stockholm lib only once New overlay code in inspired by . --- krebs/5pkgs/simple/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'krebs/5pkgs/simple') diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix index 10458001e..76ad6ff10 100644 --- a/krebs/5pkgs/simple/default.nix +++ b/krebs/5pkgs/simple/default.nix @@ -2,7 +2,7 @@ self: super: let # This callPackage will try to detect obsolete overrides. - lib = import ../../../lib; + lib = super.stockholm.lib; callPackage = path: args: let override = self.callPackage path args; upstream = lib.optionalAttrs (override ? "name") @@ -13,5 +13,4 @@ let then lib.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override else override; in - { stockholm.lib = lib; } // - lib.mapNixDir (path: callPackage path {}) ./. + lib.mapNixDir (path: callPackage path {}) ./. -- cgit v1.2.3