diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:37:53 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:38:18 +0200 |
commit | 2d6179d1e8c15d341f0cade0ab55653623eb5038 (patch) | |
tree | d69260a6e740c174c9616b2bb6d24a0e98ba8f6e /pkgs/tools/misc/findutils/default.nix | |
parent | 2e7cb61cfbe6df23a2e223f98ae61e1a385ea747 (diff) | |
parent | 9a56eee0b144c1e63afc0b5c9e562da9565ea7f0 (diff) | |
download | nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.gz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.bz2 nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.lz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.xz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.zst nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.zip |
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
Diffstat (limited to 'pkgs/tools/misc/findutils/default.nix')
-rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 66b7ef4c2919..d6eca100411b 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl , coreutils -, buildPlatform, hostPlatform }: stdenv.mkDerivation rec { @@ -17,10 +16,10 @@ stdenv.mkDerivation rec { # Since glibc-2.25 the i686 tests hang reliably right after test-sleep. doCheck - = !hostPlatform.isDarwin - && !(hostPlatform.libc == "glibc" && hostPlatform.isi686) - && (hostPlatform.libc != "musl") - && hostPlatform == buildPlatform; + = !stdenv.hostPlatform.isDarwin + && !(stdenv.hostPlatform.libc == "glibc" && stdenv.hostPlatform.isi686) + && (stdenv.hostPlatform.libc != "musl") + && stdenv.hostPlatform == stdenv.buildPlatform; outputs = [ "out" "info" ]; |