diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-10-02 14:02:47 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-05-23 21:25:04 +0200 |
| commit | 41485e7337baca768dc542c553a9d66030df7b33 (patch) | |
| tree | 6e6edd2198c5cebf1e4d4aea8369a374b53b0c04 /pkgs/stdenv/generic/make-derivation.nix | |
| parent | acb063701a6a209a514bbdefacc9bce22332ef60 (diff) | |
| download | nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.tar nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.tar.gz nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.tar.bz2 nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.tar.lz nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.tar.xz nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.tar.zst nixpkgs-41485e7337baca768dc542c553a9d66030df7b33.zip | |
stdenv.mkDerivation: be less strict about check execution for cross
Instead of requiring the platforms be equal, use `isCompatible` to determine if we can execute tests. The upside of this is that we now can execute tests for natively cross compiled package sets like pkgsStatic, pkgsLLVM and pkgsCross.musl64 etc.
Diffstat (limited to 'pkgs/stdenv/generic/make-derivation.nix')
| -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 ed457019c55..395c1586a26 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -167,8 +167,8 @@ makeOverlayable (overrideAttrs: let # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when # no package has `doCheck = true`. - doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; - doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; + doCheck' = doCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; |