diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
| commit | 6b15fdce86eddd5d23ff448f6a7b50b319c5e686 (patch) | |
| tree | 22d541647a440d8fbaabc0ec869a551ce02ff671 /pkgs/applications/video/manim/default.nix | |
| parent | 34a05e29f119bf06fe218b761b3999e4c7a87e65 (diff) | |
| parent | 788deaad9dbc27b94c0d930b617f659e71ea7987 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix
Diffstat (limited to 'pkgs/applications/video/manim/default.nix')
| -rw-r--r-- | pkgs/applications/video/manim/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index f2d33506ffcdd..0f224a5b1057b 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg_3, sox, xdg-utils, texlive +, cairo, ffmpeg, sox, xdg-utils, texlive , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , pbr, fetchPypi }: @@ -28,14 +28,14 @@ buildPythonApplication rec { pycairo pydub - cairo sox ffmpeg_3 xdg-utils + cairo sox ffmpeg xdg-utils ]; # Test with texlive to see whether it works but don't propagate # because it's huge and optional # TODO: Use smaller TexLive distribution # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg_3 xdg-utils texlive.combined.scheme-full ]; + checkInputs = [ cairo sox ffmpeg xdg-utils texlive.combined.scheme-full ]; # Simple test and complex test with LaTeX checkPhase = '' |