mirror of
https://github.com/mjallen18/snowfall-lib.git
synced 2026-04-18 09:05:58 -05:00
fix: merge overlay onto namespace if exists
This commit is contained in:
@@ -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:
|
||||||
snowfall-lib.attrs.merge-deep
|
let
|
||||||
(builtins.map (overlay: overlay final prev) (builtins.attrValues flake-outputs.overlays))
|
inherit (full-flake-options) overlay-package-namespace;
|
||||||
|
user-overlay-packages =
|
||||||
|
snowfall-lib.attrs.merge-deep
|
||||||
|
(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 // {
|
||||||
|
|||||||
Reference in New Issue
Block a user