diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index a9cef1e14090..45457ad8ebb1 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -1,16 +1,33 @@ -{ mkDerivation, lib, stdenv, fetchFromGitLab, cmake -, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python -, qtbase, qtsvg, qttools, qscintilla }: +{ mkDerivation +, lib +, stdenv +, fetchFromGitLab +, cmake +, boost +, bzip2 +, ffmpeg +, fftwSinglePrec +, hdf5 +, muparser +, netcdf +, openssl +, python3 +, qscintilla +, qtbase +, qtsvg +, qttools +, VideoDecodeAcceleration +}: mkDerivation rec { pname = "ovito"; - version = "3.4.0"; + version = "3.6.0"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5"; + sha256 = "sha256-yQ8gSe/QM1RRNxk4bDJ+K5QX0eYjZ+iG3QOHj01tJhY="; }; nativeBuildInputs = [ @@ -19,17 +36,20 @@ mkDerivation rec { buildInputs = [ boost - netcdf - hdf5 - fftwSinglePrec - muparser - openssl + bzip2 ffmpeg - python + fftwSinglePrec + hdf5 + muparser + netcdf + openssl + python3 + qscintilla qtbase qtsvg qttools - qscintilla + ] ++ lib.optionals stdenv.isDarwin [ + VideoDecodeAcceleration ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d9ee5489869..a833997f2db5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8532,7 +8532,9 @@ with pkgs; ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; + ovito = libsForQt5.callPackage ../applications/graphics/ovito { + inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; + }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { };