blender: switch to OpenJPEG 2.x

Fixes:

-- Could NOT find OpenJPEG (missing: OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)

and

  - WITH_IMAGE_OPENJPEG         OFF
This commit is contained in:
Dmitry Kalinkin 2020-01-07 13:21:36 -05:00
parent 6cd31dd525
commit e57392dbc2
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender , ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile , 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 , openvdb, libXxf86vm, tbb
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2 , jackaudioSupport ? false, libjack2
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
[ boost ffmpeg gettext glew ilmbase [ boost ffmpeg gettext glew ilmbase
libXi libX11 libXext libXrender libXi libX11 libXext libXrender
freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU libGL openal 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; }) (opensubdiv.override { inherit cudaSupport; })
openvdb libXxf86vm tbb openvdb libXxf86vm tbb
makeWrapper makeWrapper