diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-06-07 15:39:09 +0300 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-06-12 11:55:31 -0700 |
| commit | 01d4e2fe332420684803170597d1b88e9f826303 (patch) | |
| tree | 0a998e2bf5326595ec4a1fcffad7bfd963760dad /pkgs/applications/misc/blender/default.nix | |
| parent | 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (diff) | |
| download | nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.gz nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.bz2 nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.lz nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.xz nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.zst nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.zip | |
treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
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 60514c92b33..9a868d1699a 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, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost ffmpeg gettext glew ilmbase + [ boost ffmpeg_3 gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic |