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
+5 -7
View File
@@ -1,6 +1,4 @@
{ stdenv, fetchurl, unzip
, hostPlatform
}:
{ stdenv, fetchurl, unzip }:
let
# Generated upstream information
@@ -14,10 +12,10 @@ let
};
compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-mtune=generic" "-DNDEBUG" ]
++ stdenv.lib.optional (hostPlatform.isUnix) "-Dunix -pthread"
++ stdenv.lib.optional (hostPlatform.isi686) "-march=i686"
++ stdenv.lib.optional (hostPlatform.isx86_64) "-march=nocona"
++ stdenv.lib.optional (!hostPlatform.isx86) "-DNOJIT");
++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
++ stdenv.lib.optional (stdenv.hostPlatform.isi686) "-march=i686"
++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "-march=nocona"
++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
in
stdenv.mkDerivation {
inherit (s) name version;