diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-01-10 13:55:49 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-01-10 13:55:49 -0500 |
| commit | 8aa0e2fe1dca75e39582a633d1e7f41e20cf750a (patch) | |
| tree | d999e8be092fc45c66cf63d31384cf0345636d93 /pkgs/applications/misc/blender/default.nix | |
| parent | 2287d54e7dcdf647cb73b227e9f404ccc7cf3731 (diff) | |
| download | nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.tar nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.tar.gz nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.tar.bz2 nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.tar.lz nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.tar.xz nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.tar.zst nixpkgs-8aa0e2fe1dca75e39582a633d1e7f41e20cf750a.zip | |
blender: switch from openimageio to openimageio2
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2c45de3b3fe..83f2bf63642 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, python3Packages +, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages , openvdb, libXxf86vm, tbb , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff - opencolorio openexr openimageio openjpeg python zlib fftw jemalloc + opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) tbb makeWrapper @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { --replace 'set(OPENJPEG_LIBRARIES ' \ 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \ --replace 'set(OPENIMAGEIO ' \ - 'set(OPENIMAGEIO "${openimageio.out}") #' \ + 'set(OPENIMAGEIO "${openimageio2.out}") #' \ --replace 'set(OPENEXR_INCLUDE_DIRS ' \ 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' '' else '' |