From 43c7477345774db80d34f61a86e597bb89a0ac19 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 12 Apr 2019 00:20:08 -0400 Subject: 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. --- pkgs/development/libraries/arrow-cpp/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') 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; -- cgit 1.4.1