From e57392dbc29ffbb88a8dbdced811e553291a9030 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 7 Jan 2020 13:21:36 -0500 Subject: blender: switch to OpenJPEG 2.x Fixes: -- Could NOT find OpenJPEG (missing: OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) and - WITH_IMAGE_OPENJPEG OFF --- 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 0af78852204..92d3a81fb06 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages +, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg, python3Packages , openvdb, libXxf86vm, tbb , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { [ boost ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU libGL openal - opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc + opencolorio openexr openimageio openjpeg python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) openvdb libXxf86vm tbb makeWrapper -- cgit 1.4.1