From 5ea6330f77aa6a1761dc4d93082973c4a5fbfc9c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Oct 2015 15:51:04 +0200 Subject: [PATCH] blender: Update to 2.76 --- pkgs/applications/misc/blender/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index bc4c97d1f21..149cd05bd7b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew +{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python -, zlib, fftw +, zlib, fftw, opensubdiv , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada @@ -10,17 +10,18 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.75a"; + name = "blender-2.76"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "09lxb2li70p6fg7hbakin9ffy3b3101c1gdjqi3pykks5q3h9sq4"; + sha256 = "0daqirvlr0bwgrgrr7igyl8rcgjvpvrgns76z2z57kdxi6d696av"; }; buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw + (opensubdiv.override { inherit cudaSupport; }) ] ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" "-DWITH_PLAYER=ON" + "-DWITH_OPENSUBDIV=ON" "-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"