diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-15 00:00:04 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-26 20:22:51 +0000 |
| commit | 87651b32fe44b9cdeb5dc55d6197d5c5158ce42a (patch) | |
| tree | c42b7d2b507b7270a83eeb515339fa69401b4232 /pkgs/development/interpreters/python | |
| parent | 9345fc51d111bb4a35afa86fb1617855bcade43d (diff) | |
| download | nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.tar nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.tar.gz nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.tar.bz2 nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.tar.lz nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.tar.xz nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.tar.zst nixlib-87651b32fe44b9cdeb5dc55d6197d5c5158ce42a.zip | |
stdenv: steal `checkInputs` from buildPythonPackage
Note that a bunch of non-python packages use this attribute already. Some of those are clearly unaware of the fact that this attribute does not exists in stdenv because they define it but don't to add it to their `bulidInputs` :) Also note that I use `buildInputs` here and only handle regular builds because python and haskell builders do it this way and I'm not sure how to properly handle the cross-compilation case.
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 9835ba32d170..63ffdbb8c0ac 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -75,7 +75,6 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ buildInputs = [ wrapPython ] ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip - ++ lib.optionals doCheck checkInputs ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools ++ buildInputs ++ pythonPath; @@ -86,6 +85,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = doCheck; + installCheckInputs = checkInputs; postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms |