mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 16:11:22 +00:00
nanoarrow: fix build (#541822)
This commit is contained in:
13
pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff
Normal file
13
pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff
Normal file
@@ -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')
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user