ovito: 3.14.1 -> 3.15.0

This commit is contained in:
chillcicada
2026-03-21 11:43:14 +08:00
parent 28afc93f3c
commit 46e6d90edc
2 changed files with 7 additions and 16 deletions
+7 -3
View File
@@ -21,16 +21,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ovito";
version = "3.14.1";
version = "3.15.0";
src = fetchFromGitLab {
owner = "stuko";
repo = "ovito";
tag = "v${finalAttrs.version}";
hash = "sha256-SKE07bk/8cZ2etQtLrGZyp2DrNiyVk6mrgxlvJmG+Xk=";
hash = "sha256-017GjyHPHqrZt03lRFJn9yxFhD6HHyhX5vxsRX06PdA=";
fetchSubmodules = true;
};
patches = [ ./zstd.patch ];
postPatch = ''
substituteInPlace src/ovito/core/CMakeLists.txt \
--replace-fail " IF(OVITO_BUILD_CONDA)" " IF(TRUE)"
'';
nativeBuildInputs = [
cmake
-13
View File
@@ -1,13 +0,0 @@
diff --git a/src/ovito/core/CMakeLists.txt b/src/ovito/core/CMakeLists.txt
index 1b49746a6..7fda02bf4 100755
--- a/src/ovito/core/CMakeLists.txt
+++ b/src/ovito/core/CMakeLists.txt
@@ -188,7 +188,7 @@ IF(ZLIB_FOUND)
IF(OVITO_BUILD_CONDA)
TARGET_LINK_LIBRARIES(Core PUBLIC zstd::libzstd)
ELSE()
- TARGET_LINK_LIBRARIES(Core PUBLIC zstd::libzstd_static)
+ TARGET_LINK_LIBRARIES(Core PUBLIC zstd::libzstd)
ENDIF()
# Build the zstd zlib-wrapper source files.
TARGET_INCLUDE_DIRECTORIES(Core PUBLIC "$<BUILD_INTERFACE:${OVITO_SOURCE_BASE_DIR}/src/3rdparty/zstd/zlibWrapper>")