JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33670 from obsidiansystems/cross-check

Browse Source 
stdenv: Fix doCheck and doInstallCheck logic
This commit is contained in:
John Ericson 2018-01-09 16:37:11 -05:00 committed by GitHub
commit c836910e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,10 +191,10 @@ rec {
outputs = outputs'; outputs = outputs';
} // lib.optionalAttrs (attrs ? doCheck) { } // lib.optionalAttrs (attrs ? doCheck) {
# TODO(@Ericson2314): Make unconditional / resolve #33599 # TODO(@Ericson2314): Make unconditional / resolve #33599
doCheck = doCheck && (stdenv.hostPlatform == stdenv.targetPlatform); doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
} // lib.optionalAttrs (attrs ? doInstallCheck) { } // lib.optionalAttrs (attrs ? doInstallCheck) {
# TODO(@Ericson2314): Make unconditional / resolve #33599 # 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, # The meta attribute is passed in the resulting attribute set,