tiledb: fix build on darwin; libpqxx: use lib.meta.availableOn to only run tests when supported (#491215)
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
--- a/tiledb/sm/misc/generate_embedded_data_header.script.cmake
|
||||
+++ b/tiledb/sm/misc/generate_embedded_data_header.script.cmake
|
||||
@@ -40,11 +40,7 @@
|
||||
string(MAKE_C_IDENTIFIER ${INPUT_FILENAME} INPUT_VARIABLE)
|
||||
|
||||
message(DEBUG "Compressing ${INPUT_FILE} to ${compressed_file}")
|
||||
-file(ARCHIVE_CREATE OUTPUT "${compressed_file}" PATHS ${INPUT_FILE} FORMAT raw COMPRESSION Zstd
|
||||
- # Level 12 was found to have the best balance between compression ratio and speed
|
||||
- # but is available in CMake 3.26+.
|
||||
- COMPRESSION_LEVEL 9
|
||||
-)
|
||||
+execute_process(COMMAND zstd -9 -c "${INPUT_FILE}" OUTPUT_FILE "${compressed_file}")
|
||||
file(SIZE ${compressed_file} COMPRESSED_SIZE)
|
||||
message(DEBUG "Compressed size: ${COMPRESSED_SIZE} bytes")
|
||||
@@ -26,7 +26,6 @@
|
||||
nlohmann_json,
|
||||
c-blosc2,
|
||||
useAVX2 ? stdenv.hostPlatform.avx2Support,
|
||||
libpqxx,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -47,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-wzeWLwwsZXtrKsmlglZG7YvIki/ba7IwsDBq+40ltcg=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tiledb/sm/misc/test/unit_parse_argument.cc \
|
||||
--replace-fail '"catch.hpp"' '<catch2/catch_all.hpp>'
|
||||
@@ -85,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
file
|
||||
libpng
|
||||
libpqxx
|
||||
lz4
|
||||
nlohmann_json
|
||||
onetbb
|
||||
|
||||
Reference in New Issue
Block a user