diff options
| author | Artturi <Artturin@artturin.com> | 2023-10-13 07:18:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 07:18:12 +0300 |
| commit | 183df628daa5a3cd433490fbb3e6bcafc814ef26 (patch) | |
| tree | 16d9f1d930b47d39e1dc6500c76c66b36e5327b4 /pkgs/development/interpreters/python | |
| parent | 2bcd37e6d554f6f8d1a0cf599d62518825429648 (diff) | |
| parent | 48f25989c32ee63eb19f9fa7fc68c09ce9a8aef8 (diff) | |
Merge pull request #258223 from OroraTech/fix/propagated-sphinx
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 |