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/stdenv/generic | |
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/stdenv/generic')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 96e40a78e518..b523374454fc 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -36,6 +36,9 @@ rec { , depsTargetTarget ? [] # 1 -> 1 , depsTargetTargetPropagated ? [] # 1 -> 1 + , checkInputs ? [] + , installCheckInputs ? [] + # Configure Phase , configureFlags ? [] , # Target is not included by default because most programs don't care. @@ -101,7 +104,9 @@ rec { ] [ (map (drv: drv.__spliced.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) buildInputs) + (map (drv: drv.crossDrv or drv) (buildInputs + ++ lib.optionals doCheck' checkInputs + ++ lib.optionals doInstallCheck' installCheckInputs)) ] [ (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) @@ -155,6 +160,7 @@ rec { (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" "doCheck" "doInstallCheck" + "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // { |