From 8a2c2e48b40adab228a83ad673b9cb78cf6ad165 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Feb 2020 01:46:17 +0000 Subject: [PATCH 1/3] blender: 2.81a -> 2.82 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 83f2bf63642d..ab1c82a7fe4a 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.81a"; + version = "2.82"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j"; + sha256 = "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From ac560382c5fe69b8b5375a44117da99a35cbf8a6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 15 Feb 2020 06:39:27 -0500 Subject: [PATCH 2/3] blender: fix build on darwin We don't compile blender with alembic. The linux build is able to detect that, but this is not done for darwin. This explicitly disables alembic to fix blender build on darwin. --- pkgs/applications/misc/blender/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index ab1c82a7fe4a..c14d0cda1df5 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -75,7 +75,9 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - [ "-DWITH_MOD_OCEANSIM=ON" + [ + "-DWITH_ALEMBIC=OFF" + "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" From 128c99978dcf7d793fb2f88ed8dfe70ec4609e1d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 23 Feb 2020 12:10:53 +0100 Subject: [PATCH 3/3] blender: enable alembic --- pkgs/applications/misc/blender/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c14d0cda1df5..277bb5fe1f25 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,7 +2,7 @@ , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages -, openvdb, libXxf86vm, tbb +, openvdb, libXxf86vm, tbb, alembic , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc + alembic (opensubdiv.override { inherit cudaSupport; }) tbb makeWrapper @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ - "-DWITH_ALEMBIC=OFF" + "-DWITH_ALEMBIC=ON" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON"