diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
commit | 1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f (patch) | |
tree | 313bc0caa017c3e41a961bf63c7b70aac8bc6334 /pkgs/applications/misc/blender/default.nix | |
parent | 525c54c7ef4ac6bc86e1a9f84cff72af43884d2a (diff) | |
parent | ab0a828662c4c6a8535b630081a67c20286099ab (diff) | |
download | nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.gz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.bz2 nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.lz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.xz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.zst nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
-rw-r--r-- | pkgs/applications/misc/blender/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index dd9f2929d36..8c4833be3e6 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,6 +2,7 @@ , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages +, openvdb, libXxf86vm, tbb , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit @@ -15,11 +16,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.80"; + version = "2.81"; src = fetchurl { - url = "https://download.blender.org/source/${pname}-${version}.tar.gz"; - sha256 = "1h550jisdbis50hxwk5kxrvrk1a6sh2fsri3yyj66vhzbi87x7fd"; + url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; + sha256 = "1prp0f2152f1sz23jlc86vndfvmplb7qhllikkirq7hgpykrshna"; }; nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU libGL openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) + openvdb libXxf86vm tbb makeWrapper ] ++ optional jackaudioSupport libjack2 @@ -56,6 +58,9 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" + "-DWITH_OPENVDB=ON" + "-DWITH_TBB=ON" + "-DWITH_IMAGE_OPENJPEG=ON" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" |