From 850930b13f409c2e7ae8b08108abbb6b40e18f06 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 29 Oct 2021 02:01:01 -0400 Subject: [PATCH] arrow-cpp: search for Thrift using pkg-config instead of cmake Setting it to "AUTO" allows for the first[1] find_package to fail through to pkg-config search logic. [1] https://github.com/apache/arrow/blob/2ae84e8e90a7c0d8cd37df07d69e982dcfd16eaf/cpp/cmake_modules/ThirdpartyToolchain.cmake#L228 --- pkgs/development/libraries/arrow-cpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index bea566174689..7f3896f41be5 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -90,6 +90,7 @@ in stdenv.mkDerivation rec { "-DARROW_BUILD_TESTS=ON" "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" + "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent) "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON"