diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
| commit | 1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02 (patch) | |
| tree | bae982223d71e1d3760d022a26f2e06b7202e255 /pkgs/applications/misc/blender/default.nix | |
| parent | 98f95ef9c4559c96cf852e5c0dae1d5124145a78 (diff) | |
| parent | 0905a5d99031c213c20c962e9501a2202602741b (diff) | |
| download | nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.gz nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.bz2 nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.lz nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.xz nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.zst nixpkgs-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.zip | |
Merge master into staging-next
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 4249cec45c0..bf2a89ade55 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 |