summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-01-07 13:21:36 -0500
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-01-09 02:53:06 -0500
commite57392dbc29ffbb88a8dbdced811e553291a9030 (patch)
treebe002da46696b10932461857412ffb863dbb4386 /pkgs/applications/misc
parent6cd31dd5256f0771f300fa03a66ed1611e3d6941 (diff)
downloadnixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.tar
nixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.tar.gz
nixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.tar.bz2
nixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.tar.lz
nixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.tar.xz
nixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.tar.zst
nixpkgs-e57392dbc29ffbb88a8dbdced811e553291a9030.zip
blender: switch to OpenJPEG 2.x
Fixes:

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

and

  - WITH_IMAGE_OPENJPEG         OFF
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/blender/default.nix4
1 files changed, 2 insertions, 2 deletions
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