summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-15 23:31:07 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-15 23:34:34 +0200
commit327c2061d126d016fee69de2ad5392eaae1b5f1a (patch)
tree9a8d46b2f13b6e908e47753c252a18965b07d560 /pkgs
parent12fb52b08a9e2e99664b9d5c5c34c1994e496700 (diff)
downloadnixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.tar
nixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.tar.gz
nixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.tar.bz2
nixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.tar.lz
nixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.tar.xz
nixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.tar.zst
nixlib-327c2061d126d016fee69de2ad5392eaae1b5f1a.zip
blender: Don't use system openjpeg
It was ignored anyway (instead using the internal openjpeg copy).
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/blender/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index ce811412df14..c6a6fa7861ca 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
       libjpeg libpng libsamplerate libsndfile libtiff mesa openal
-      opencolorio openexr openimageio openjpeg python zlib fftw
+      opencolorio openexr openimageio /* openjpeg */ python zlib fftw
     ] ++ optional jackaudioSupport jackaudio;
 
   postUnpack =