diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:54:04 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-13 14:43:18 +0100 |
| commit | a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071 (patch) | |
| tree | 196770eca08635578173c8411121329aa2298063 /pkgs/stdenv | |
| parent | a4faf59aa131b9ab76c507d0158d4314815220e3 (diff) | |
| download | nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.tar nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.tar.gz nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.tar.bz2 nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.tar.lz nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.tar.xz nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.tar.zst nixpkgs-a1a5ea59433257ab3a46bb67aaf05e9b7d8aa071.zip | |
stdenv: make checkInputs native
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.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index f3c4afb613e..88808a7b3f9 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -125,14 +125,14 @@ rec { (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) (map (drv: drv.nativeDrv or drv) nativeBuildInputs ++ 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.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) (buildInputs - ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck' installCheckInputs)) + (map (drv: drv.crossDrv or drv) buildInputs) ] [ (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) |