Skip to content

Commit

Permalink
stdenv.mkDerivation: add checkInputs to buildInputs
Browse files Browse the repository at this point in the history
today we only add them to nativeBuildInputs, but this is insufficient
when strictDeps is true.

also affects installCheckInputs.

Fixes NixOS#161570
  • Loading branch information
symphorien committed Feb 23, 2022
1 parent 7c4a6c5 commit a0c3a4b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/stdenv/generic/make-derivation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ else let
]
[
(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)
Expand Down

0 comments on commit a0c3a4b

Please sign in to comment.