diff --git a/pkgs/by-name/ov/ovito/package.nix b/pkgs/by-name/ov/ovito/package.nix index ab4eaaa8e06b..29482befe143 100644 --- a/pkgs/by-name/ov/ovito/package.nix +++ b/pkgs/by-name/ov/ovito/package.nix @@ -15,26 +15,32 @@ openssl, python3, qt6Packages, + imagemagick, copyDesktopItems, nix-update-script, }: 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 qt6Packages.wrapQtAppsHook + imagemagick copyDesktopItems ]; @@ -79,7 +85,8 @@ stdenv.mkDerivation (finalAttrs: { }; in '' - install -Dm644 ${icon} $out/share/pixmaps/ovito.png + mkdir -p $out/share/icons/hicolor/512x512/apps + magick ${icon} -resize 512x512 $out/share/icons/hicolor/512x512/apps/ovito.png ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ov/ovito/zstd.patch b/pkgs/by-name/ov/ovito/zstd.patch deleted file mode 100644 index f5a9ce28ee09..000000000000 --- a/pkgs/by-name/ov/ovito/zstd.patch +++ /dev/null @@ -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 "$")