mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-23 13:24:29 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
27 lines
927 B
Diff
27 lines
927 B
Diff
--- 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})
|
|
|