diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 09:00:06 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 09:00:06 +0200 |
| commit | 0196d8f11cff9790531f7599153a077bb493b9cf (patch) | |
| tree | 7ef549aa58c987961d33b4c7ade22edb6fb6ec31 /pkgs/tools/archivers | |
| parent | 193b899af2052051cb4eacf868fc8169c675d26f (diff) | |
| parent | a3f8a25ab30578bc851049ee8d468da09d21dff2 (diff) | |
| download | nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.tar nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.tar.gz nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.tar.bz2 nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.tar.lz nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.tar.xz nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.tar.zst nixpkgs-0196d8f11cff9790531f7599153a077bb493b9cf.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/archivers/zpaq/zpaqd.nix | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 309604999ba..48b3a91b971 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -19,10 +19,7 @@ stdenv.mkDerivation rec { CPPFLAGS = with stdenv; "" + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + "-Dunix"; - CXXFLAGS = with stdenv; "" - + (lib.optionalString isi686 "-march=i686 -mtune=generic ") - + (lib.optionalString isx86_64 "-march=nocona -mtune=generic ") - + "-O3 -DNDEBUG"; + CXXFLAGS = "-O3 -DNDEBUG"; in '' buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 344f0889090..611654331c3 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -11,10 +11,8 @@ let sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; - compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-mtune=generic" "-DNDEBUG" ] + compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] ++ 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 { |