diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-30 21:45:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-30 21:49:14 +0200 |
| commit | 2537bc85463f393411ab516f5d56aa547dfa592a (patch) | |
| tree | 0a97b938d3ff71243ff1801cc6e0d12f81c7cdcd /pkgs/applications/misc/blender | |
| parent | ad6b2a68a7bbec8c3e6e5e2e440f4d1b90e4f6f5 (diff) | |
| download | nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.tar nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.tar.gz nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.tar.bz2 nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.tar.lz nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.tar.xz nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.tar.zst nixlib-2537bc85463f393411ab516f5d56aa547dfa592a.zip | |
blender: 2.77a -> 2.78
Also fix the openjpeg dependency (it has to be openjpeg 1), and use jemalloc which is also what the upstream binaries use.
Diffstat (limited to 'pkgs/applications/misc/blender')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index d76c935f0a69..734364b9ccda 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile -, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python -, zlib, fftw, opensubdiv, freetype +, ilmbase, libXi, libX11, libXext, libXrender +, libjpeg, libpng, libsamplerate, libsndfile +, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, zlib, fftw, opensubdiv, freetype, jemalloc , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada @@ -10,17 +11,18 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.77a"; + name = "blender-2.78"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p"; + sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp"; }; buildInputs = - [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype - libjpeg libpng libsamplerate libsndfile libtiff mesa openal - opencolorio openexr openimageio openjpeg python zlib fftw + [ boost cmake ffmpeg gettext glew ilmbase + libXi libX11 libXext libXrender + freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal + opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) ] ++ optional jackaudioSupport libjack2 @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_FFTW3=ON" - "-DWITH_SDL=ON" + #"-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" "-DWITH_SYSTEM_OPENJPEG=ON" |