diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-01-09 16:37:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 16:37:11 -0500 |
| commit | c836910e0e61a9cfe333214fa194c2e28eeb8c1b (patch) | |
| tree | 8524174c942c1d8d36e83e59b26efc7d6db42d04 /pkgs/stdenv/generic | |
| parent | a6912f589edb0f144c9bfb00e0bb6e6822656da1 (diff) | |
| parent | 567feb3a548c8185590c9bff6aa7200246f6af98 (diff) | |
| download | nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.tar nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.tar.gz nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.tar.bz2 nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.tar.lz nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.tar.xz nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.tar.zst nixlib-c836910e0e61a9cfe333214fa194c2e28eeb8c1b.zip | |
Merge pull request #33670 from obsidiansystems/cross-check
stdenv: Fix doCheck and doInstallCheck logic
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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, |