From 8032f96d8ebdec3f62c47f29ab60f42b400bddca Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Fri, 16 Dec 2022 07:34:45 +0700
Subject: [PATCH] chore: remove some more `lib // builtins`

---
 src/modules/builders/implementation.nix                   | 5 ++---
 src/modules/functions.combined-fetcher/implementation.nix | 2 +-
 src/modules/interfaces.fetcher/interface.nix              | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

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 = {