public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blender: 2.77a -> 2.78

Browse Source 
Also fix the openjpeg dependency (it has to be openjpeg 1), and use
jemalloc which is also what the upstream binaries use.
This commit is contained in:
Eelco Dolstra 2016-09-30 21:45:41 +02:00
parent ad6b2a68a7
commit 2537bc8546
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/misc/blender/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile , ilmbase, libXi, libX11, libXext, libXrender
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , libjpeg, libpng, libsamplerate, libsndfile
, zlib, fftw, opensubdiv, freetype , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python
, zlib, fftw, opensubdiv, freetype, jemalloc
, jackaudioSupport ? false, libjack2 , jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit , cudaSupport ? false, cudatoolkit
, colladaSupport ? true, opencollada , colladaSupport ? true, opencollada
@ -10,17 +11,18 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "blender-2.77a"; name = "blender-2.78";
src = fetchurl { src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz"; url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p"; sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp";
}; };
buildInputs = buildInputs =
[ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype [ boost cmake ffmpeg gettext glew ilmbase
libjpeg libpng libsamplerate libsndfile libtiff mesa openal libXi libX11 libXext libXrender
opencolorio openexr openimageio openjpeg python zlib fftw freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
(opensubdiv.override { inherit cudaSupport; }) (opensubdiv.override { inherit cudaSupport; })
] ]
++ optional jackaudioSupport libjack2 ++ optional jackaudioSupport libjack2
@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
"-DWITH_CODEC_SNDFILE=ON" "-DWITH_CODEC_SNDFILE=ON"
"-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_FFTW3=ON" "-DWITH_FFTW3=ON"
"-DWITH_SDL=ON" #"-DWITH_SDL=ON"
"-DWITH_GAMEENGINE=ON" "-DWITH_GAMEENGINE=ON"
"-DWITH_OPENCOLORIO=ON" "-DWITH_OPENCOLORIO=ON"
"-DWITH_SYSTEM_OPENJPEG=ON" "-DWITH_SYSTEM_OPENJPEG=ON"