pass lib to overlays

Author: bayou-brogrammer

andromeda-lib/flake/default.nix

@@ -12,7 +12,7 @@ in rec {
     without-self = flake-inputs: builtins.removeAttrs flake-inputs ["self"];
 
     # @TODO: Find if this is needed or not
-    without-andromeda-inputs = andromeda-lib.fp.compose without-src;
+    without-andromeda-inputs = without-src;
     # without-andromeda-inputs = andromeda-lib.fp.compose without-self without-src;
 
     ## Remove Andromeda-specific attributes so the rest can be safely passed to flake-utils-plus.

andromeda-lib/internal/default.nix

@@ -8,7 +8,8 @@
   inherit (core-inputs.nixpkgs.lib) fix filterAttrs callPackageWith;
 
   core-inputs-libs = andromeda-lib.flake.get-libs (andromeda-lib.flake.without-self core-inputs);
-  user-inputs-libs = andromeda-lib.flake.get-libs (andromeda-lib.flake.without-self user-inputs);
+  user-inputs-libs = andromeda-lib.flake.get-libs user-inputs;
+  # user-inputs-libs = andromeda-lib.flake.get-libs (andromeda-lib.flake.without-self user-inputs);
 
   andromeda-top-level-lib = filterAttrs (_name: value: !builtins.isAttrs value) andromeda-lib;
 

andromeda-lib/overlay/default.nix

@@ -22,6 +22,7 @@ in {
           // {
             inherit channels;
             inputs = user-inputs;
+            lib = andromeda-lib.internal.system-lib;
           });
 
       user-packages-overlay = final: prev: let
@@ -78,6 +79,7 @@ in {
             // {
               inherit channels;
               inputs = user-inputs;
+              lib = andromeda-lib.internal.system-lib;
             });
           packages = user-packages-overlay final prev;
           prev-with-packages =