summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/flake.nix b/flake.nix
index 5fa2d1d..2b53ebd 100644
--- a/flake.nix
+++ b/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;
}
{