From fb9727a19874b60d85690dc5a4046301328289b1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 24 Jan 2025 18:14:22 +0800 Subject: [PATCH] makeOverridablePythonPackage: allow buildPython* to take fixed-point arguments --- .../interpreters/python/python-packages-base.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index c513561ce6fb..dfb19b651285 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -23,7 +23,11 @@ let origArgs: let result = f origArgs; - overrideWith = newArgs: origArgs // lib.toFunction newArgs origArgs; + overrideWith = + if lib.isFunction origArgs then + newArgs: lib.extends (_: lib.toFunction newArgs) origArgs + else + newArgs: origArgs // lib.toFunction newArgs origArgs; in if lib.isAttrs result then result