From d9d8c8a7fc5c46aff67d500297e3c5a53e055d73 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Nov 2020 14:49:33 -0500 Subject: 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). --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/misc/blender/default.nix') diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 718765e6efe..882139794c9 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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 -- cgit 1.4.1