diff options
| author | Leandro Reina <leandro.reina@ororatech.com> | 2023-09-09 21:34:33 +0200 |
|---|---|---|
| committer | Leandro Reina <leandro.reina@ororatech.com> | 2023-09-09 21:34:33 +0200 |
| commit | a3916398458f9dee7efb6cc12bc2b1d28980d38e (patch) | |
| tree | b3ca323215375c6f36f75841876d318a29b8912c | |
| parent | 7548f17e61c1bd2322df280e7d09fd440c2fff57 (diff) | |
| download | nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.tar nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.tar.gz nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.tar.bz2 nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.tar.lz nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.tar.xz nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.tar.zst nixpkgs-a3916398458f9dee7efb6cc12bc2b1d28980d38e.zip | |
python3Packages.sphinxHook: Fix cross compilation
Failed due to using host sphinx instead of build one.
| -rw-r--r-- | pkgs/development/interpreters/python/hooks/default.nix | 4 | ||||
| -rw-r--r-- | 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 74aff43f7ca..306c33a91fd 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 97704fc3e53..1366a150f5b 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 { }; |