diff options
| author | Alejandro Soto <alejandro@34project.org> | 2025-08-31 10:38:53 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2025-08-31 10:38:53 -0600 |
| commit | 54d3e49c895513284b09e56afbe7747d25202bc4 (patch) | |
| tree | 5990f0f046197e5c63955ac0a295e518193466d5 /trivionomicon/flake.nix | |
| parent | 742433a5442930609af0d3bbb1ab8ab71c422a66 (diff) | |
trivionomicon/flake: fix overlay stacking
Diffstat (limited to '')
| -rw-r--r-- | trivionomicon/flake.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/trivionomicon/flake.nix b/trivionomicon/flake.nix index 5fa2d1d..2b53ebd 100644 --- a/trivionomicon/flake.nix +++ b/trivionomicon/flake.nix @@ -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; } { |