diff options
| -rw-r--r-- | pkgs/development/interpreters/python/hooks/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 0557c62eeff4..bc7d011944e1 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -8,7 +8,9 @@ let pythonCheckInterpreter = python.interpreter; setuppy = ../run_setup.py; in { - makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args); + makePythonHook = let + defaultArgs = { passthru.provides.setupHook = true; }; + in args: pkgs.makeSetupHook (lib.recursiveUpdate defaultArgs args); condaInstallHook = callPackage ({ makePythonHook, gnutar, lbzip2 }: makePythonHook { @@ -68,8 +70,8 @@ in { # Such conflicts don't happen within the standard nixpkgs python package # set, but in downstream projects that build packages depending on other # versions of this hook's dependencies. - passthru.tests = import ./pypa-build-hook-test.nix { - inherit pythonOnBuildForHost runCommand; + passthru.tests = callPackage ./pypa-build-hook-test.nix { + inherit pythonOnBuildForHost; }; } ./pypa-build-hook.sh) { inherit (pythonOnBuildForHost.pkgs) build; |