ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-30 15:23:26 +03:00
Code Issues Projects Releases Wiki Activity

stdenv: make checkInputs native

Browse Source 
We can't run the checkPhase when build != host, so we may as well make
the checkInputs native.

This signicantly improves the situation of Python packages when enabling
strictDeps.
This commit is contained in:
Frederik Rietdijk 2019-01-05 10:54:04 +01:00 committed by Frederik Rietdijk
parent a4faf59aa1
commit a1a5ea5943
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/stdenv.xml
View File

@ -1810,7 +1810,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
<listitem> <listitem>
<para> <para>
A list of dependencies used by the phase. This gets included in A list of dependencies used by the phase. This gets included in
<varname>buildInputs</varname> when <varname>doInstallCheck</varname> is <varname>nativeBuildInputs</varname> when <varname>doInstallCheck</varname> is
set. set.
</para> </para>
</listitem> </listitem>

8
pkgs/stdenv/generic/make-derivation.nix
View File

@ -125,14 +125,14 @@ rec {
(map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild)
(map (drv: drv.nativeDrv or drv) nativeBuildInputs (map (drv: drv.nativeDrv or drv) nativeBuildInputs
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh) ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
++ lib.optionals doCheck checkInputs
++ lib.optionals doInstallCheck' installCheckInputs)
(map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget)
] ]
[ [
(map (drv: drv.__spliced.hostHost or drv) depsHostHost) (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) (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget)