ovito: 3.11.0 -> 3.11.1 (#359535)

NixOS · Dec 18, 2024 · 17cfee7 · 17cfee7
2 parents 51c976d + 28a8a3a
commit 17cfee7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix
@@ -26,14 +26,16 @@
 
 stdenv.mkDerivation rec {
   pname = "ovito";
-  version = "3.11.0";
+  version = "3.11.1";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
     rev = "v${version}";
-    hash = "sha256-egiA6z1e8ZS7i4CIVjsCKJP1wQSRpmSKitoVTszu0Mc=";
+    hash = "sha256-ulzcsFAiZDg8nABQXNB2/MS7lZdK3czGHLKgKDWS15E=";
+    fetchSubmodules = true;
   };
+  patches = [ ./zstd.patch ];
 
   nativeBuildInputs = [
     cmake

diff --git a/pkgs/applications/graphics/ovito/zstd.patch b/pkgs/applications/graphics/ovito/zstd.patch
@@ -0,0 +1,13 @@
+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>")