diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 28040a6..e70009f 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -25,7 +25,7 @@ self: super: pkgs: with pkgs; { openslide = callPackage ./openslide { }; - ovito = libsForQt5.callPackage ./ovito.nix { libav = libav_12; }; + ovito = libsForQt5.callPackage ./ovito.nix { }; pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs); diff --git a/pkgs/ovito.nix b/pkgs/ovito.nix index 91a5a5f..f74335f 100644 --- a/pkgs/ovito.nix +++ b/pkgs/ovito.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, cmake -, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, libav, python +, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python , qtbase, qtsvg, qttools, qscintilla }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { fftwSinglePrec muparser openssl - libav + ffmpeg python qtbase qtsvg qttools qscintilla ];