Merge pull request #242665 from amarshall/blender-3.6

blender: 3.5.1 -> 3.6.0
This commit is contained in:
Pol Dellaiera 2023-07-11 11:49:31 +02:00 committed by GitHub
commit 94820b98ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
version = "3.5.1";
version = "3.6.0";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk=";
hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk=";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
pythonPath = with python310Packages; [ numpy requests ];
postPatch = ''
# allow usage of dynamically linked embree
rm build_files/cmake/Modules/FindEmbree.cmake
'' +
(if stdenv.isDarwin then ''
: > build_files/cmake/platform/platform_apple_xcode.cmake