From 9b89fcee8a5aa3615bb81d6eb12da53749fe4a47 Mon Sep 17 00:00:00 2001
From: Eman Resu <elevenaka11@gmail.com>
Date: Wed, 14 Oct 2026 22:57:14 -0400
Subject: [PATCH] lib/customisation/makeOverridable: inline setFunctionArgs

Saves a merge and two function calls.
---
 lib/customisation.nix | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 37d25eece04e..fb4d4da7623f 100644
--- 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