From d3c939d0feca66755d86ed5060a3515905041497 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 14 Jul 2026 14:45:17 +0000 Subject: [PATCH] nanoarrow: fix build with c++20 Co-Authored-By: Doron Behar --- pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff | 13 +++++++++++++ pkgs/by-name/na/nanoarrow/package.nix | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff diff --git a/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff new file mode 100644 index 000000000000..ee8d2dcfa412 --- /dev/null +++ b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff @@ -0,0 +1,13 @@ +diff --git i/meson.build w/meson.build +index 5c3032d..5ec2e56 100644 +--- i/meson.build ++++ w/meson.build +@@ -22,7 +22,7 @@ project( + version: '0.8.0', + license: 'Apache-2.0', + meson_version: '>=0.58.0', +- default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++17'], ++ default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++20'], + ) + + cc = meson.get_compiler('c') diff --git a/pkgs/by-name/na/nanoarrow/package.nix b/pkgs/by-name/na/nanoarrow/package.nix index 07b48bdb0dbf..862f2ce0bff3 100644 --- a/pkgs/by-name/na/nanoarrow/package.nix +++ b/pkgs/by-name/na/nanoarrow/package.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: { tag = "apache-arrow-nanoarrow-${finalAttrs.version}"; hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls="; }; + patches = [ + # Fixes an issue between our `arrow-cpp` and this version of `nanoarrow`. + # Not applicable for upstreaming so it seems. See discussion: + # https://github.com/apache/arrow-nanoarrow/issues/902 + ./cpp20-arrow-cpp-fix.diff + ]; nativeBuildInputs = [ meson