kylekrein/snowfall-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use the right nixpkgs when consuming overlays

Browse source
This commit is contained in:
Jake Hamilton 2022-09-09 01:41:20 -07:00
parent 13cd056669
commit 6ed0b9f668
No known key found for this signature in database
GPG key ID: 9762169A1B35EA68
4 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/flake/default.nix
View file

@ -79,15 +79,9 @@ rec {
overrides = (full-flake-options.modules or { });
};
overlays = core-inputs.flake-utils-plus.lib.exportOverlays ({
inherit (user-inputs.self) pkgs;
inputs = user-inputs;
inherit (user-inputs.self) pkgs inputs;
});
overlay = (final: prev:
snowfall-lib.attrs.merge-deep
(builtins.map (overlay: overlay final prev) (builtins.attrValues overlays))
);
outputs-builder = channels:
let
user-outputs-builder =
@ -113,7 +107,7 @@ rec {
snowfall-lib.attrs.merge-deep [ user-outputs outputs ];
flake-options = custom-flake-options // {
inherit hosts templates overlays overlay;
inherit hosts templates overlays;
inherit (user-inputs) self;
lib = snowfall-lib.internal.user-lib;
@ -130,6 +124,16 @@ rec {
outputsBuilder = outputs-builder;
};
flake-outputs =
core-inputs.flake-utils-plus.lib.mkFlake flake-options;
overlay = (final: prev:
snowfall-lib.attrs.merge-deep
(builtins.map (overlay: overlay final prev) (builtins.attrValues flake-outputs.overlays))
);
in
core-inputs.flake-utils-plus.lib.mkFlake flake-options;
flake-outputs // {
inherit overlay;
};
}