diff options
author | Leandro Reina <leandro.reina@ororatech.com> | 2023-09-30 18:21:18 +0200 |
---|---|---|
committer | Leandro Reina <leandro.reina@ororatech.com> | 2023-09-30 18:21:18 +0200 |
commit | 48f25989c32ee63eb19f9fa7fc68c09ce9a8aef8 (patch) | |
tree | 7f5ce740858b7ad20250d910a7484b801d6ca2b0 /pkgs/development/interpreters/python | |
parent | c67f06b3f085ca29b0fa3b06fea5ceed8ddb4f4c (diff) |
python3Packages.sphinxHook: Avoid propagating sphinx
Fixes some side effects of #249157 (see #255810)
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/hooks/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/hooks/sphinx-hook.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index ba51c43822d47..6a05a7fa6ee89 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -227,6 +227,9 @@ in { sphinxHook = callPackage ({ makePythonHook, installShellFiles }: makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; - propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ]; + propagatedBuildInputs = [ installShellFiles ]; + substitutions = { + sphinxBuild = "${pythonForBuild.pkgs.sphinx}/bin/sphinx-build"; + }; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ca67fa9beabf3..0307e83d94799 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -38,7 +38,7 @@ buildSphinxPhase() { for __builder in "${__sphinxBuilders[@]}"; do echo "Executing sphinx-build with ${__builder} builder" - sphinx-build -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v + @sphinxBuild@ -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v done runHook postBuildSphinx |