treewide: Remove usage of remaining redundant platform compatability stuff

Want to get this out of here for 18.09, so it can be deprecated
thereafter.
This commit is contained in:
John Ericson
2018-08-30 17:20:32 -04:00
parent 2c2f1e37d4
commit 0828e2d8c3
149 changed files with 545 additions and 603 deletions
+4 -5
View File
@@ -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" ];