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

Merge pull request #73875 from gebner/blender281

Browse Source 
blender: 2.80 -> 2.81
This commit is contained in:
Gabriel Ebner 2019-11-21 21:53:34 +01:00 committed by GitHub
commit 26328a4cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU_combined, 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_combined 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"

6
pkgs/top-level/all-packages.nix
View File

@ -7463,7 +7463,7 @@ in
zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
@ -13368,9 +13368,7 @@ in
openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { };
opensubdiv = callPackage ../development/libraries/opensubdiv {
cmake = cmake_2_8;
};
opensubdiv = callPackage ../development/libraries/opensubdiv { };
open-wbo = callPackage ../applications/science/logic/open-wbo {};