git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93203 from veprbl/pr/arrow-cpp_zstd_link_static

arrow-cpp: fix darwin build by linking against libzstd_static

commit992db90c4c3dfc0bcf954ab8024769d268720206 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateWed 15 Jul 2020, 22:15 (6 years ago) parent178de844ae8a49
2 files changed+10
pkgs/development/libraries/arrow-cpp/default.nix+8 pkgs/top-level/all-packages.nix+2
pkgs/development/libraries/arrow-cpp/default.nix+8
@@ -42,6 +42,13 @@ in stdenv.mkDerivation rec {
4242 sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y";
4343 stripLen = 1;
4444 })
45+
46+ # fix build for "ZSTD_SOURCE=SYSTEM"
47+ (fetchpatch {
48+ url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff";
49+ sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb";
50+ stripLen = 1;
51+ })
4552 ] ++ lib.optionals (!enableShared) [
4653 # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic.
4754 ./jemalloc-disable-shared.patch
@@ -89,6 +96,7 @@ in stdenv.mkDerivation rec {
8996 "-DARROW_WITH_SNAPPY=ON"
9097 "-DARROW_WITH_ZLIB=ON"
9198 "-DARROW_WITH_ZSTD=ON"
99+ "-DARROW_ZSTD_USE_SHARED=OFF" # TODO use shared zstd once #91984 hits the master
92100 # Parquet options:
93101 "-DARROW_PARQUET=ON"
94102 "-DPARQUET_BUILD_EXECUTABLES=ON"
pkgs/top-level/all-packages.nix+2
@@ -11426,6 +11426,8 @@ in
1142611426 arrayfire = callPackage ../development/libraries/arrayfire {};
1142711427
1142811428 arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
11429+ # Workaround until #91984 is in, this will need to be removed later.
11430+ zstd = zstd.override { enableShared = false; };
1142911431 } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
1143011432 stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
1143111433 });