Python hooks: use spliced packages in hooks
This fixes issues when cross-compiling.
This commit is contained in:
parent
52117cce92
commit
7a41be7b2a
1 changed files with 3 additions and 6 deletions
|
@ -4,9 +4,6 @@
|
|||
, makeSetupHook
|
||||
, disabledIf
|
||||
, isPy3k
|
||||
, ensureNewerSourcesForZipFilesHook
|
||||
, findutils
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -107,7 +104,7 @@ in rec {
|
|||
};
|
||||
} ./python-imports-check-hook.sh) {};
|
||||
|
||||
pythonNamespacesHook = callPackage ({}:
|
||||
pythonNamespacesHook = callPackage ({ findutils }:
|
||||
makeSetupHook {
|
||||
name = "python-namespaces-hook.sh";
|
||||
substitutions = {
|
||||
|
@ -173,7 +170,7 @@ in rec {
|
|||
};
|
||||
} ./unittest-check-hook.sh) {};
|
||||
|
||||
venvShellHook = disabledIf (!isPy3k) (callPackage ({ }:
|
||||
venvShellHook = disabledIf (!isPy3k) (callPackage ({ ensureNewerSourcesForZipFilesHook }:
|
||||
makeSetupHook {
|
||||
name = "venv-shell-hook";
|
||||
deps = [ ensureNewerSourcesForZipFilesHook ];
|
||||
|
@ -188,7 +185,7 @@ in rec {
|
|||
deps = [ wheel ];
|
||||
} ./wheel-unpack-hook.sh) {};
|
||||
|
||||
sphinxHook = callPackage ({ sphinx }:
|
||||
sphinxHook = callPackage ({ sphinx, installShellFiles }:
|
||||
makeSetupHook {
|
||||
name = "python${python.pythonVersion}-sphinx-hook";
|
||||
deps = [ sphinx installShellFiles ];
|
||||
|
|
Loading…
Reference in a new issue