Unverified Commit 0cdfc628 authored by Michael Daniels's avatar Michael Daniels
Browse files

tiledb: regenerate capnproto before building 

Removes the need to keep the capnproto version in sync.
parent dd9b425b

pkgs/by-name/ti/tiledb/0001-fix-cross-compilation-with-capnproto.patch

0 → 100644
+29 −0
Original line number Diff line number Diff line 
From 300f6e39cfc1723f0c703a3050cf0c2fd943baee Mon Sep 17 00:00:00 2001

From: Michael Daniels <mdaniels5757@gmail.com>

Date: Sun, 15 Mar 2026 10:14:06 -0400

Subject: [PATCH] fix cross-compilation with capnproto



See https://github.com/capnproto/capnproto/issues/1802

---

 tiledb/CMakeLists.txt | 5 +++++

 1 file changed, 5 insertions(+)



diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt

index 8bf8559ed..1b5adb80c 100644

--- a/tiledb/CMakeLists.txt

+++ b/tiledb/CMakeLists.txt

@@ -617,6 +617,11 @@ target_include_directories(TILEDB_CORE_OBJECTS

 # Serialization

 if(TILEDB_SERIALIZATION)

   find_package(CapnProto REQUIRED)

+  find_program(CAPNP_EXECUTABLE_HOST capnp REQUIRED)

+  set_target_properties(CapnProto::capnp_tool PROPERTIES

+    IMPORTED_LOCATION ${CAPNP_EXECUTABLE_HOST}

+  )

+

   target_link_libraries(TILEDB_CORE_OBJECTS_ILIB

           INTERFACE

           CapnProto::capnp

-- 

2.51.2

pkgs/by-name/ti/tiledb/package.nix

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-wzeWLwwsZXtrKsmlglZG7YvIki/ba7IwsDBq+40ltcg=";

  };



  patches = [ ./0001-fix-cross-compilation-with-capnproto.patch ];



  postPatch = ''

    substituteInPlace tiledb/sm/misc/test/unit_parse_argument.cc \

      --replace-fail '"catch.hpp"' '<catch2/catch_all.hpp>'
@@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";



  nativeBuildInputs = [

    capnproto

    clang-tools

    cmake

    python3
@@ -92,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { 
    zstd

  ];



  preBuild = ''

    cmake --build . --target update-serialization

  '';



  nativeCheckInputs = [

    gtest

  ];