diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-26 14:49:33 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-26 14:49:54 -0500 |
| commit | d9d8c8a7fc5c46aff67d500297e3c5a53e055d73 (patch) | |
| tree | c4cee646dfb4058b1c3b64f809589124d8d7a532 /pkgs/applications/misc/blender/default.nix | |
| parent | b8bc039a13e103b4518d88e3606dade63206308d (diff) | |
| download | nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.tar nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.tar.gz nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.tar.bz2 nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.tar.lz nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.tar.xz nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.tar.zst nixpkgs-d9d8c8a7fc5c46aff67d500297e3c5a53e055d73.zip | |
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).
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 |