diff options
author | Nick Cao <nickcao@nichi.co> | 2022-01-09 09:39:13 +0800 |
---|---|---|
committer | Nick Cao <nickcao@nichi.co> | 2022-01-09 09:39:13 +0800 |
commit | c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2 (patch) | |
tree | 17e2233ddab60484ebd5868305cfa3411e04226a /pkgs/tools/archivers | |
parent | 8aeafc25c9cd9701920599019490d109dd1ea4e9 (diff) | |
download | nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.tar nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.tar.gz nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.tar.bz2 nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.tar.lz nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.tar.xz nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.tar.zst nixpkgs-c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2.zip |
zpaq: cleanup and fix cross compilation
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 150633e620a..6d0f00f5149 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -13,17 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl /* for pod2man */ ]; - preBuild = let - CPPFLAGS = with stdenv; "" - + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") - + "-Dunix"; - CXXFLAGS = "-O3 -DNDEBUG"; - in '' - buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) - ''; + CPPFLAGS = [ "-Dunix" ] ++ + lib.optional (!stdenv.isi686 && !stdenv.isx86_64) "-DNOJIT"; + CXXFLAGS = [ "-O3" "-DNDEBUG" ]; enableParallelBuilding = true; + makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { |