From 567feb3a548c8185590c9bff6aa7200246f6af98 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 9 Jan 2018 16:21:24 -0500 Subject: stdenv: Fix doCheck and doInstallCheck logic It's host != build, not host != target --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/stdenv/generic') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 3ffa7cfe35fc..396ed553999d 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -191,10 +191,10 @@ rec { outputs = outputs'; } // lib.optionalAttrs (attrs ? doCheck) { # TODO(@Ericson2314): Make unconditional / resolve #33599 - doCheck = doCheck && (stdenv.hostPlatform == stdenv.targetPlatform); + doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform); } // lib.optionalAttrs (attrs ? doInstallCheck) { # TODO(@Ericson2314): Make unconditional / resolve #33599 - doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.targetPlatform); + doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.buildPlatform); }); # The meta attribute is passed in the resulting attribute set, -- cgit 1.4.1