diff --git a/src/modules/builders/implementation.nix b/src/modules/builders/implementation.nix index 64b0f804..b397cba9 100644 --- a/src/modules/builders/implementation.nix +++ b/src/modules/builders/implementation.nix @@ -1,6 +1,5 @@ {config, ...}: let - lib = config.lib; - l = lib // builtins; + l = config.lib; defaults = { # TODO: define a priority in each builder and remove the defaults here. rust = "build-rust-package"; @@ -19,7 +18,7 @@ in { builders = funcs.import_ collectedModules; buildersBySubsystem = - lib.mapAttrs + l.mapAttrs ( subsystem: builders: builders diff --git a/src/modules/functions.combined-fetcher/implementation.nix b/src/modules/functions.combined-fetcher/implementation.nix index 09e9fbef..5f3340c1 100644 --- a/src/modules/functions.combined-fetcher/implementation.nix +++ b/src/modules/functions.combined-fetcher/implementation.nix @@ -18,7 +18,7 @@ ... } @ args: let b = builtins; - l = lib // builtins; + l = config.lib; # resolve to individual fetcher calls defaultFetched = (defaultFetcher args).fetchedSources; diff --git a/src/modules/interfaces.fetcher/interface.nix b/src/modules/interfaces.fetcher/interface.nix index e5ca2dc6..06526289 100644 --- a/src/modules/interfaces.fetcher/interface.nix +++ b/src/modules/interfaces.fetcher/interface.nix @@ -1,5 +1,5 @@ -{framework, ...}: let - l = framework.lib // builtins; +{lib, ...}: let + l = lib // builtins; t = l.types; outputsOptions = {