Merge pull request #209227 from amarshall/arrow-cpp-shrink-closure
This commit is contained in:
commit
6ebc1f9773
1 changed files with 13 additions and 2 deletions
|
@ -65,6 +65,17 @@ let
|
|||
hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0=";
|
||||
};
|
||||
|
||||
aws-sdk-cpp-arrow = aws-sdk-cpp.override {
|
||||
apis = [
|
||||
"cognito-identity"
|
||||
"config"
|
||||
"identity-management"
|
||||
"s3"
|
||||
"sts"
|
||||
"transfer"
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arrow-cpp";
|
||||
|
@ -144,7 +155,7 @@ stdenv.mkDerivation rec {
|
|||
grpc
|
||||
openssl
|
||||
protobuf
|
||||
] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ]
|
||||
] ++ lib.optionals enableS3 [ aws-sdk-cpp-arrow openssl ]
|
||||
++ lib.optionals enableGcs [
|
||||
crc32c
|
||||
curl
|
||||
|
@ -205,7 +216,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
|
||||
] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"
|
||||
++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"
|
||||
++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h"
|
||||
++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
Loading…
Reference in a new issue