diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index ff0699365ef3..61cf3f2b941b 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -45,16 +45,16 @@ let
 
   overrideStdenvCompat =
     f:
-    lib.setFunctionArgs (
+    lib.mirrorFunctionArgs f (
       args:
       if !(lib.isFunction args) && (args ? stdenv) then
         lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) ''
           Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:
             buildPythonPackage.override { stdenv = customStdenv; } { }
-        '' (f.override { stdenv = args.stdenv; } args)
+        '' (f.override { inherit (args) stdenv; } args)
       else
         f args
-    ) (removeAttrs (lib.functionArgs f) [ "stdenv" ])
+    )
     // {
       # Intentionally drop the effect of overrideStdenvCompat when calling `buildPython*.override`.
       inherit (f) override;