cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

arrow-cpp: fix darwin build by linking against libzstd_static

Browse source 
The enableShared=false override will need to be reverted on staging.
This commit is contained in:
Dmitry Kalinkin 2020-07-15 19:45:22 -04:00
parent 4af55b773f
commit 4ae8a4977b
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/arrow-cpp/default.nix
View file

@ -42,6 +42,13 @@ in stdenv.mkDerivation rec {
sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y";
stripLen = 1; stripLen = 1;
}) })
# fix build for "ZSTD_SOURCE=SYSTEM"
(fetchpatch {
url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff";
sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb";
stripLen = 1;
})
] ++ lib.optionals (!enableShared) [ ] ++ lib.optionals (!enableShared) [
# The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic.
./jemalloc-disable-shared.patch ./jemalloc-disable-shared.patch
@ -89,6 +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
# 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,6 +11426,8 @@ 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'
}); });