lib/customisation/makeOverridable: inline setFunctionArgs

Saves a merge and two function calls.
2026-10-30 16:10:36 +00:00 · 2026-10-14 22:57:14 -04:00
parent 2ebb5e0765
commit 9b89fcee8a
1 changed files with 19 additions and 19 deletions
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -8,30 +8,29 @@ let
    ;
  inherit (lib)
    all
-    attrValues
-    functionArgs
-    isFunction
-    mirrorFunctionArgs
-    isAttrs
-    setFunctionArgs
-    optionalAttrs
    attrNames
-    filter
-    elemAt
+    attrValues
    concatStringsSep
-    sortOn
-    take
-    length
+    deepSeq
+    elemAt
+    extends
+    filter
+    flatten
+    functionArgs
    head
-    pipe
+    id
+    isAttrs
    isDerivation
+    isFunction
+    length
    listToAttrs
    mapAttrs
+    mirrorFunctionArgs
+    optionalAttrs
+    pipe
    seq
-    flatten
-    deepSeq
-    extends
-    id
+    sortOn
+    take
    ;
  inherit (lib.strings) levenshtein levenshteinAtMost;

@@ -193,8 +192,9 @@ rec {
          }
        else if isFunction result then
          # Transform the result into a functor while propagating its arguments
-          setFunctionArgs result (functionArgs result)
-          // {
+          {
+            __functor = self: result;
+            __functionArgs = functionArgs result;
            override = overrideArgs;
          }
        else