Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ovito: Switch from avlib to ffmpeg (avlib is likely going away)

Browse Source
This commit is contained in:
Tyson Whitehead
2021-01-31 01:03:37 -05:00
parent 2a26edb361
commit 95119fbace
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/all-packages.nix
View File

@@ -25,7 +25,7 @@ self: super: pkgs: with pkgs; {
openslide = callPackage ./openslide { }; 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); pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs);

4
pkgs/ovito.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, cmake { stdenv, fetchFromGitLab, cmake
, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, libav, python , boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python
, qtbase, qtsvg, qttools, qscintilla }: , qtbase, qtsvg, qttools, qscintilla }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
fftwSinglePrec fftwSinglePrec
muparser muparser
openssl openssl
libav ffmpeg
python python
qtbase qtsvg qttools qscintilla qtbase qtsvg qttools qscintilla
]; ];