From e92e056a00e86f3bd2172a114892cccb03313ab8 Mon Sep 17 00:00:00 2001 From: Birdee <85372418+BirdeeHub@users.noreply.github.com> Date: Wed, 13 May 2026 03:55:20 -0700 Subject: [PATCH] ci(flake): overlay overwriting other lua packageOverrides overlays --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 506b181..9e9eed0 100644 --- a/flake.nix +++ b/flake.nix @@ -54,11 +54,11 @@ }; # lua5_1 = prev.lua5_1.override { packageOverrides }; l_pkg_main = builtins.mapAttrs ( - n: _: (prev.lib.attrByPath [ n "override" ] null prev) { - packageOverrides = luaself: luaprev: { + n: _: (prev.lib.attrByPath [ n "override" ] null prev) (old: { + packageOverrides = luaself: luaprev: (if old ? packageOverrides then old.packageOverrides luaself luaprev else {}) // { ${APPNAME} = luaself.callPackage luaCallPackageFn {}; }; - } + }) ) l_pkg_enum; # lua51Packages = final.lua5_1.pkgs; l_pkg_sets = builtins.listToAttrs (