diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 14:43:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
| commit | 0828e2d8c369604c56219bd7085256b984087280 (patch) | |
| tree | 507e0429674ad3a42bf5dcd11413d3c834f95c74 /pkgs/tools/archivers/zpaq | |
| parent | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (diff) | |
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.
Diffstat (limited to 'pkgs/tools/archivers/zpaq')
| -rw-r--r-- | pkgs/tools/archivers/zpaq/zpaqd.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 0d60e79624605..344f088909065 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -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; |