diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-01-09 13:41:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 13:41:10 +0000 |
| commit | 372e11acc2281c92dad4ef9b0efcfa78297871a5 (patch) | |
| tree | 89b7a225ae3ca111f66e612b023be5de6e9cc091 /pkgs/tools/archivers | |
| parent | 1403bb136c1577740965e6b1f31224ba3823047e (diff) | |
| parent | c9f08ace52ee152e0dd75bc071e4159c0bcc7cc2 (diff) | |
| download | nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.tar nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.tar.gz nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.tar.bz2 nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.tar.lz nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.tar.xz nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.tar.zst nixpkgs-372e11acc2281c92dad4ef9b0efcfa78297871a5.zip | |
Merge pull request #154089 from NickCao/zpaq
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; { |