mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 08:44:31 +00:00
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.
This commit is contained in:
parent
ad6b2a68a7
commit
2537bc8546
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user