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

fix: merge overlay onto namespace if exists

Browse source
This commit is contained in:
Jake Hamilton 2022-09-09 02:21:48 -07:00
parent 6ed0b9f668
commit 2a38ef1105
No known key found for this signature in database
GPG key ID: 9762169A1B35EA68
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/flake/default.nix
View file

@ -129,8 +129,26 @@ rec {
core-inputs.flake-utils-plus.lib.mkFlake flake-options; core-inputs.flake-utils-plus.lib.mkFlake flake-options;
overlay = (final: prev: overlay = (final: prev:
let
inherit (full-flake-options) overlay-package-namespace;
user-overlay-packages =
snowfall-lib.attrs.merge-deep snowfall-lib.attrs.merge-deep
(builtins.map (overlay: overlay final prev) (builtins.attrValues flake-outputs.overlays)) (builtins.map (overlay: overlay final prev) (builtins.attrValues flake-outputs.overlays));
in
if overlay-package-namespace or null == null then
user-overlay-packages
else if prev ? "${overlay-package-namespace}" then
{
${overlay-package-namespace} =
snowfall-lib.attrs.merge-deep [
prev.${overlay-package-namespace}
user-overlay-packages
];
}
else
{
${overlay-package-namespace} = user-overlay-packages;
}
); );
in in
flake-outputs // { flake-outputs // {