Delayed update...
This commit is contained in:
@@ -25,7 +25,7 @@ final: prev: with prev; {
|
||||
|
||||
openslide = callPackage ./openslide { };
|
||||
|
||||
ovito = libsForQt5.callPackage ./ovito.nix { };
|
||||
ovito = qt6Packages.callPackage ./ovito.nix { };
|
||||
|
||||
pythonOverrides = lib.composeExtensions prev.pythonOverrides (import ./python-packages.nix pkgs);
|
||||
|
||||
|
||||
@@ -12,6 +12,12 @@
|
||||
extension = "zip";
|
||||
sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff";
|
||||
};
|
||||
nativeCheckInputs = [
|
||||
prev.pytest
|
||||
# "hypothesis" indirectly depends on numpy to build its documentation.
|
||||
prev.hypothesis
|
||||
prev.typing-extensions
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,28 +1,53 @@
|
||||
{ mkDerivation, lib, fetchFromGitLab, cmake
|
||||
, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python38
|
||||
, qtbase, qtsvg, qttools, qscintilla }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, ninja
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtnetworkauth
|
||||
, qtscxml
|
||||
, qtsvg
|
||||
, ffmpeg
|
||||
, netcdf
|
||||
, libssh
|
||||
, boost
|
||||
, hdf5
|
||||
, python3 ? python3
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ovito";
|
||||
version = "3.4.0";
|
||||
version = "3.8.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stuko";
|
||||
repo = "ovito";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5";
|
||||
sha256 = "Vw9mB+huQHLg8OqyGo9KEg55ag3NQG+nTJj3tB++eQk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
boost
|
||||
netcdf hdf5
|
||||
fftwSinglePrec
|
||||
muparser
|
||||
openssl
|
||||
ninja
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtnetworkauth
|
||||
qtscxml
|
||||
qtsvg
|
||||
ffmpeg
|
||||
python38
|
||||
qtbase qtsvg qttools qscintilla
|
||||
netcdf
|
||||
libssh
|
||||
boost
|
||||
hdf5
|
||||
python3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOVITO_BUILD_PYPI=${if python3 != null then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Reference in New Issue
Block a user