From a3916398458f9dee7efb6cc12bc2b1d28980d38e Mon Sep 17 00:00:00 2001 From: Leandro Reina Date: Sat, 9 Sep 2023 21:34:33 +0200 Subject: [PATCH] python3Packages.sphinxHook: Fix cross compilation Failed due to using host sphinx instead of build one. --- pkgs/development/interpreters/python/hooks/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 74aff43f7cae..306c33a91fdd 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -221,9 +221,9 @@ in { inherit (pkgs.buildPackages) makeWrapper; }; - sphinxHook = callPackage ({ makePythonHook, sphinx, installShellFiles }: + sphinxHook = callPackage ({ makePythonHook, installShellFiles }: makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; - propagatedBuildInputs = [ sphinx installShellFiles ]; + propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ]; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97704fc3e532..1366a150f5be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1350,9 +1350,7 @@ self: super: with self; { beautiful-date = callPackage ../development/python-modules/beautiful-date { }; - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { - inherit (python.pythonForBuild.pkgs) sphinxHook; # hook splicing broken since #194205 - }; + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beautifultable = callPackage ../development/python-modules/beautifultable { };