diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-12 00:20:08 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-12 21:44:09 -0400 |
| commit | 43c7477345774db80d34f61a86e597bb89a0ac19 (patch) | |
| tree | 2a4e17edd1e2587ca9ad5bca6e0937455677279f /pkgs/development/libraries/arrow-cpp | |
| parent | 45da66351c330b403aae8bd66a2e4c30de87abb6 (diff) | |
| download | nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.tar nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.tar.gz nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.tar.bz2 nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.tar.lz nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.tar.xz nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.tar.zst nixpkgs-43c7477345774db80d34f61a86e597bb89a0ac19.zip | |
arrow-cpp: fix build on architectures other than x86_64
Settting ARROW_USE_SIMD=OFF used to fix i686 build for 1.12.0. The fix for ARROW-5007 should help on aarch64.
Diffstat (limited to 'pkgs/development/libraries/arrow-cpp')
| -rw-r--r-- | pkgs/development/libraries/arrow-cpp/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a5f05482dff..7f7ef3336a4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake patchShebangs build-support/ + + # Fix build for ARROW_USE_SIMD=OFF + # https://jira.apache.org/jira/browse/ARROW-5007 + sed -i src/arrow/util/sse-util.h -e '1i#include "arrow/util/logging.h"' + sed -i src/arrow/util/neon-util.h -e '1i#include "arrow/util/logging.h"' ''; cmakeFlags = [ @@ -52,7 +57,7 @@ stdenv.mkDerivation rec { "-DARROW_PARQUET=ON" "-DARROW_PYTHON=ON" "-Duriparser_SOURCE=SYSTEM" - ]; + ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; |