From 65e307825c223112eaf9492c3d91aa2d94bffa80 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 15 Jan 2023 20:51:21 +0200
Subject: [PATCH] Revert "use overrideAttrs in makeOverridable"

This reverts commit a2cee1acda1f6a07ba2092147075f8812292acf5.
---
 lib/customisation.nix | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 1b57a594f89a3..cb3a4b561151f 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -88,32 +88,13 @@ rec {
       overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs));
       # Change the result of the function call by applying g to it
       overrideResult = g: makeOverridable (copyArgs (args: g (f args))) origArgs;
-
-      args =
-        (_: previousAttrs: {
-          passthru = (previousAttrs.passthru or { }) // {
-            override = overrideArgs;
-            overrideDerivation = fdrv: overrideResult (x: overrideDerivation x fdrv);
-            # error: stack overflow (possible infinite recursion)
-            #overrideAttrs = fdrv:
-            #  overrideResult (x: x.overrideAttrs fdrv);
-          };
-        });
-
     in
-      if builtins.isAttrs result && result ? overrideAttrs then
-        (result.overrideAttrs args) #// {
-          # is this even necessary?
-          # nix-diff shows no difference in cross/non
-          # nix-diff $(nix eval --raw "nixpkgs/$(git merge-base upstream/master HEAD)#nix.drvPath") $(nix eval --raw ".#nix.drvPath")
-          # nix-diff $(nix eval --raw "nixpkgs/$(git merge-base upstream/master HEAD)#pkgsCross.aarch64-multiplatform.nix.drvPath") $(nix eval --raw ".#pkgsCross.aarch64-multiplatform.nix.drvPath")
-          #overrideAttrs = fdrv:
-          #  overrideResult (x: x.overrideAttrs fdrv);
-        #}
-      else if builtins.isAttrs result then
+      if builtins.isAttrs result then
         result // {
           override = overrideArgs;
           overrideDerivation = fdrv: overrideResult (x: overrideDerivation x fdrv);
+          ${if result ? overrideAttrs then "overrideAttrs" else null} = fdrv:
+            overrideResult (x: x.overrideAttrs fdrv);
         }
       else if lib.isFunction result then
         # Transform the result into a functor while propagating its arguments