From 562f476fb54ab748ff6b1ed05b0f97870e72563c Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Fri, 26 Mar 2021 09:54:37 -0700
Subject: [PATCH 1/2] lib/mkPkgs: fix function arguments take extern and
 overrides as arguments as to not import external files get inputs as a
 function dependency from callLib

---
 flake.nix            | 5 ++++-
 lib/devos/mkPkgs.nix | 8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 082f501a..a4c648c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,8 +34,11 @@
       inherit (lib) os;
 
       extern = import ./extern { inherit inputs; };
+      overrides = import ./overrides;
 
-      multiPkgs = os.mkPkgs;
+      multiPkgs = os.mkPkgs {
+        inherit extern overrides;
+      };
 
       outputs = {
         nixosConfigurations =
diff --git a/lib/devos/mkPkgs.nix b/lib/devos/mkPkgs.nix
index 9b76e6df..fba62a1c 100644
--- a/lib/devos/mkPkgs.nix
+++ b/lib/devos/mkPkgs.nix
@@ -1,13 +1,11 @@
-{ lib, dev, nixos, self, ... }:
+{ lib, dev, nixos, self, inputs, ... }:
 
-let inherit (self) inputs;
-in
+{ extern, overrides }:
 (inputs.utils.lib.eachDefaultSystem
   (system:
     let
-      extern = import ../../extern { inherit inputs; };
       overridePkgs = dev.os.pkgImport inputs.override [ ] system;
-      overridesOverlay = (import ../../overrides).packages;
+      overridesOverlay = overrides.packages;
 
       overlays = [
         (overridesOverlay overridePkgs)

From e10fd4b3193a240b1d84cc4cf1e0d55007343c21 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Sat, 27 Mar 2021 09:21:27 -0700
Subject: [PATCH 2/2] shell: get extern and overrides to pass to mkpkgs

---
 flake.nix         | 2 +-
 shell/default.nix | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index a4c648c4..83fd1ba8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,7 +89,7 @@
             (os.mkPackages { inherit pkgs; });
 
           devShell = import ./shell {
-            inherit self system;
+            inherit self system extern overrides;
           };
         }
       );
diff --git a/shell/default.nix b/shell/default.nix
index 72ac09e4..0b132f99 100644
--- a/shell/default.nix
+++ b/shell/default.nix
@@ -1,8 +1,12 @@
 { self ? (import ../compat).defaultNix
 , system ? builtins.currentSystem
+, extern ? import ../extern { inherit (self) inputs; }
+, overrides ? import ../overrides
 }:
 let
-  pkgs = (self.lib.os.mkPkgs).${system};
+  pkgs = (self.lib.os.mkPkgs {
+    inherit overrides extern;
+  }).${system};
 
   inherit (pkgs) lib;