public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arrow-cpp: fix eval, enable linking against zstd_shared 

This is a second part for #93203.
This commit is contained in:
Dmitry Kalinkin 2020-07-15 22:35:31 -04:00
parent 9173beb67d
commit 166a71a6ae
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
"-DARROW_WITH_SNAPPY=ON" "-DARROW_WITH_SNAPPY=ON"
"-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZLIB=ON"
"-DARROW_WITH_ZSTD=ON" "-DARROW_WITH_ZSTD=ON"
"-DARROW_ZSTD_USE_SHARED=OFF" # TODO use shared zstd once #91984 hits the master "-DARROW_ZSTD_USE_SHARED=${if enableShared then "ON" else "OFF"}"
# Parquet options: # Parquet options:
"-DARROW_PARQUET=ON" "-DARROW_PARQUET=ON"
"-DPARQUET_BUILD_EXECUTABLES=ON" "-DPARQUET_BUILD_EXECUTABLES=ON"

2
pkgs/top-level/all-packages.nix
View File

@ -11426,8 +11426,6 @@ in
arrayfire = callPackage ../development/libraries/arrayfire {}; arrayfire = callPackage ../development/libraries/arrayfire {};
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
# Workaround until #91984 is in, this will need to be removed later.
zstd = zstd.override { enableShared = false; };
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
}); });