git.iko.soy/typeable/nixpkgs
on master help sign in
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).

commitd9d8c8a7fc5c46aff67d500297e3c5a53e055d73 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateThu 26 Nov 2020, 14:49 (6 years ago) parentb8bc039
1 file changed+2−2
pkgs/applications/misc/blender/default.nix+2−2
pkgs/applications/misc/blender/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew
1+{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
22, ilmbase, libXi, libX11, libXext, libXrender
33, libjpeg, libpng, libsamplerate, libsndfile
44, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929
3030 nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
3131 buildInputs =
32− [ boost ffmpeg_3 gettext glew ilmbase
32+ [ boost ffmpeg gettext glew ilmbase
3333 freetype libjpeg libpng libsamplerate libsndfile libtiff
3434 opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
3535 alembic