about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2023-12-04 15:30:17 +1300
committeradisbladis <adisbladis@gmail.com>2024-02-17 21:19:26 +1300
commite23b9013214a82ccb85bf42c10ff52253b6dd126 (patch)
tree4ff5f8041bb1bbc4c6904c017cb9bcea351744fb /pkgs
parent48a49f76d77375018dbdb719b59fc6d8ed52104d (diff)
downloadnixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.tar
nixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.tar.gz
nixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.tar.bz2
nixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.tar.lz
nixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.tar.xz
nixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.tar.zst
nixlib-e23b9013214a82ccb85bf42c10ff52253b6dd126.zip
python3.hooks: Dont completely overwrite passthru when creating setup hook
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/python/hooks/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index 04748df7f49c..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 {