deepState/trivionomicon
3
0
Fork 1
Code Issues Pull requests Releases Wiki Activity Actions

trivionomicon/flake: fix overlay stacking

Browse source
This commit is contained in:
Alejandro Soto 2025-08-31 10:38:53 -06:00
parent 4e039920c8
commit 49dae97575
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -9,11 +9,11 @@
nixpkgs, nixpkgs,
flake-utils, flake-utils,
}: let }: let
mapOverlayOverride = namespace: overlay: final: prev: let mapOverlayOverride = prefix: overlay: final: prev: let
overlayPkgs = overlay final prev; overlayPkgs = overlay final prev;
in in
{ {
"${namespace}" = builtins.removeAttrs overlayPkgs ["override"]; "${prefix}" = (prev.${prefix} or {}) // builtins.removeAttrs overlayPkgs ["override"];
} }
// (overlayPkgs.override or {}); // (overlayPkgs.override or {});
@ -30,7 +30,7 @@
packages = packages =
(import nixpkgs { (import nixpkgs {
inherit system; inherit system;
overlays = [(mapOverlayOverride doctrineNoPkgs.prefix (import ./pkgs))]; overlays = [self.overlays.default];
}).${ }).${
doctrineNoPkgs.prefix doctrineNoPkgs.prefix
}; };
@ -121,7 +121,7 @@
} }
# NB: Preserve the relative order # NB: Preserve the relative order
{ {
overlay = self.overlays.default; overlay = mapOverlayOverride prefix (import ./pkgs);
condition = true; condition = true;
} }
{ {