Commit aa66f76d authored by Angus Gibson's avatar Angus Gibson
Browse files

tiledb: fix build on darwin 

The patched file no longer exists in 2.30.0
parent f6250ba1

pkgs/by-name/ti/tiledb/generate_embedded_data_header.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
--- 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")

pkgs/by-name/ti/tiledb/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,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>'