|
1 | 1 | { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew |
2 | 2 | , ilmbase, libXi, libX11, libXext, libXrender |
3 | 3 | , libjpeg, libpng, libsamplerate, libsndfile |
4 | | -, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg, python3Packages |
| 4 | +, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages |
5 | 5 | , openvdb, libXxf86vm, tbb |
6 | 6 | , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath |
7 | 7 | , jackaudioSupport ? false, libjack2 |
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { |
30 | 30 | buildInputs = |
31 | 31 | [ boost ffmpeg gettext glew ilmbase |
32 | 32 | freetype libjpeg libpng libsamplerate libsndfile libtiff |
33 | | - opencolorio openexr openimageio openjpeg python zlib fftw jemalloc |
| 33 | + opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc |
34 | 34 | (opensubdiv.override { inherit cudaSupport; }) |
35 | 35 | tbb |
36 | 36 | makeWrapper |
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec { |
67 | 67 | --replace 'set(OPENJPEG_LIBRARIES ' \ |
68 | 68 | 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \ |
69 | 69 | --replace 'set(OPENIMAGEIO ' \ |
70 | | - 'set(OPENIMAGEIO "${openimageio.out}") #' \ |
| 70 | + 'set(OPENIMAGEIO "${openimageio2.out}") #' \ |
71 | 71 | --replace 'set(OPENEXR_INCLUDE_DIRS ' \ |
72 | 72 | 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' |
73 | 73 | '' else '' |
|
0 commit comments