From db9ff9eb8a5a60b9484e7780684bb0e89c471224 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 10 Jul 2023 08:50:13 -0400 Subject: [PATCH] blender: 3.5.1 -> 3.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without removing the `rm … FindEmbree`, compilation fails due to various macros depending on the version of embree. The nixpkgs history provides no indication of why this patch is done (it has been present since the addition of embree as a dep in 6b74f99abd2f4c62e8093cfbdb104f60661d5405), and the build succeeds without them, so remove. --- pkgs/applications/misc/blender/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index cc1252899b51..81b7a54a754d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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