From 89f39f58e571a0b2a9ef356163a9e65eff9d1289 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 09:43:36 +0300 Subject: [PATCH] arrow-cpp: fix paths in CMake and pkg-config files --- pkgs/development/libraries/arrow-cpp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index d3b736fbe0f0..1402fc6ed946 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , fetchFromGitHub , fixDarwinDylibNames , abseil-cpp @@ -112,6 +113,14 @@ stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch + # in master post 8.0.0, see https://github.com/apache/arrow/pull/13182 + (fetchpatch { + name = "fix-pkg-config.patch"; + stripLen = 1; + excludes = [ "src/arrow/engine/arrow-substrait.pc.in" ]; # for < 8.0.0 + url = "https://github.com/apache/arrow/commit/a242eb17362c0352fc3291213542c48abfe18669.patch"; + sha256 = "15gz13f8q75l7d4z5blyvxd805hwfcvrbrxs2kbfal9vcbnirycx"; + }) ]; nativeBuildInputs = [