mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 19:30:11 +00:00
[staging-next] apache-orc: explicitly specify C++17 for abseil-cpp (#545413)
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
cmake,
|
||||
abseil-cpp,
|
||||
gtest,
|
||||
lz4,
|
||||
protobuf,
|
||||
@@ -13,6 +14,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# This standard needs to match the version that orc uses, or compilation
|
||||
# fails if the C++ standard version is different from the compiler's default.
|
||||
# https://github.com/apache/orc/blob/3738b82366ba64cacae450e7e0e1702c66148afe/CMakeLists.txt#L108
|
||||
protobuf' = protobuf.override { abseil-cpp = abseil-cpp.override { cxxStandard = "17"; }; };
|
||||
|
||||
orc-format =
|
||||
let
|
||||
version = "1.1.1";
|
||||
@@ -52,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
gtest
|
||||
lz4
|
||||
protobuf
|
||||
protobuf'
|
||||
snappy
|
||||
zlib
|
||||
zstd
|
||||
@@ -75,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
GTEST_HOME = gtest.dev;
|
||||
LZ4_HOME = lz4;
|
||||
ORC_FORMAT_URL = orc-format;
|
||||
PROTOBUF_HOME = protobuf.full; # Configure script expects to find both executables and headers at this path.
|
||||
PROTOBUF_HOME = protobuf'.full; # Configure script expects to find both executables and headers at this path.
|
||||
SNAPPY_HOME = snappy.dev;
|
||||
ZLIB_HOME = zlib.dev;
|
||||
ZSTD_HOME = zstd.dev;
|
||||
|
||||
Reference in New Issue
Block a user