blender: use ffmpeg instead of ffmpeg_3

build_files/cmake/Modules/FindFFmpeg.cmake currently searches for
libavcodec/ac3_parser.h which is not present in ffmpeg_3 (at least on
darwin).
This commit is contained in:
Dmitry Kalinkin 2020-11-26 14:49:33 -05:00
parent b8bc039a13
commit d9d8c8a7fc
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333

View file

@ -1,4 +1,4 @@
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
buildInputs =
[ boost ffmpeg_3 gettext glew ilmbase
[ boost ffmpeg gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff
opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
alembic