trivionomicon/flake: fix overlay stacking
This commit is contained in:
parent
4e039920c8
commit
49dae97575
1 changed files with 4 additions and 4 deletions
|
@ -9,11 +9,11 @@
|
|||
nixpkgs,
|
||||
flake-utils,
|
||||
}: let
|
||||
mapOverlayOverride = namespace: overlay: final: prev: let
|
||||
mapOverlayOverride = prefix: overlay: final: prev: let
|
||||
overlayPkgs = overlay final prev;
|
||||
in
|
||||
{
|
||||
"${namespace}" = builtins.removeAttrs overlayPkgs ["override"];
|
||||
"${prefix}" = (prev.${prefix} or {}) // builtins.removeAttrs overlayPkgs ["override"];
|
||||
}
|
||||
// (overlayPkgs.override or {});
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
|||
packages =
|
||||
(import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [(mapOverlayOverride doctrineNoPkgs.prefix (import ./pkgs))];
|
||||
overlays = [self.overlays.default];
|
||||
}).${
|
||||
doctrineNoPkgs.prefix
|
||||
};
|
||||
|
@ -121,7 +121,7 @@
|
|||
}
|
||||
# NB: Preserve the relative order
|
||||
{
|
||||
overlay = self.overlays.default;
|
||||
overlay = mapOverlayOverride prefix (import ./pkgs);
|
||||
condition = true;
|
||||
}
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue