diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch new file mode 100644 index 000000000000..8f2bd8579ed8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt 2019-10-11 12:12:27.445417039 -0400 ++++ b/CMakeLists.txt 2019-10-11 12:27:26.630691742 -0400 +@@ -22,14 +22,6 @@ + message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'") + message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'") + +-ExternalProject_Add(project_blosc +- PREFIX ${BLOSC_PREFIX} +- GIT_REPOSITORY https://github.com/Blosc/c-blosc.git +- INSTALL_DIR ${BLOSC_INSTALL_DIR} +- CMAKE_ARGS ${BLOSC_CMAKE_ARGS} +-) +- +- + # sources + set(SOURCES src/blosc_filter.c) + set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c ) +@@ -53,7 +45,6 @@ + # add blosc libraries + add_library(blosc_shared SHARED IMPORTED) + set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX}) +-add_dependencies(blosc_shared project_blosc) + include_directories(${BLOSC_INSTALL_DIR}/include) + + add_library(blosc_filter_shared SHARED ${SOURCES}) + |