overrides: allow passing functions for attributes

2025-01-03 20:06:15 +03:00 · 2021-10-26 20:53:29 +07:00 · 2021-10-26 20:53:29 +07:00 · 1219a10592
commit 1219a10592
parent a0466031c0
1 changed files with 13 additions and 1 deletions
--- a/src/utils/override.nix
+++ b/src/utils/override.nix
@ -52,7 +52,19 @@ let
              (lib.filterAttrs (n: v: lib.hasPrefix "override" n) condOverride);
          in
            b.foldl'
-              (pkg: overrideFunc: pkg."${overrideFunc.funcName}" overrideFunc.func)
+              (pkg: overrideFunc:
+                pkg."${overrideFunc.funcName}"
+                (old:
+                  let
+                    updateAttrsFuncs = overrideFunc.func old;
+                  in
+                    lib.mapAttrs
+                      (attrName: maybeFunction:
+                        if b.isFunction maybeFunction then
+                          maybeFunction old."${attrName}"
+                        else
+                          maybeFunction)
+                      updateAttrsFuncs))
              pkg
              overrideFuncs;
      in