From 48f25989c32ee63eb19f9fa7fc68c09ce9a8aef8 Mon Sep 17 00:00:00 2001 From: Leandro Reina Date: Sat, 30 Sep 2023 18:21:18 +0200 Subject: [PATCH] python3Packages.sphinxHook: Avoid propagating sphinx Fixes some side effects of #249157 (see #255810) --- pkgs/development/interpreters/python/hooks/default.nix | 5 ++++- 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 ba51c43822d4..6a05a7fa6ee8 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 ca67fa9beabf..0307e83d9479 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