From dba7c0b42418482b1975224ccd62a0468891d9a0 Mon Sep 17 00:00:00 2001
From: Daniel Hill <daniel@gluo.nz>
Date: Thu, 17 Jul 2025 16:19:39 +1200
Subject: [PATCH 1/3] manifold: move clipper2 to propagatedBuildInputs

---
 pkgs/by-name/ma/manifold/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index 119fc497c73c..c1a4c4cfddaa 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     glm
     tbb_2021
-    clipper2
   ];
 
+  propagatedBuildInputs = [ clipper2 ];
+
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
     "-DMANIFOLD_TEST=ON"

From 51a67c7968abf190f950f6b405ffd80793f9f843 Mon Sep 17 00:00:00 2001
From: Daniel Hill <daniel@gluo.nz>
Date: Thu, 12 Jun 2025 11:03:17 +1200
Subject: [PATCH 2/3] blender: 4.4 -> 4.5

tbb minimum version of 2021.13 is now required, migrated to v2022.x.
---
 pkgs/by-name/bl/blender/package.nix | 30 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 7cf4b1a96a6d..8dde30b3e814 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -15,6 +15,7 @@
   dbus,
   embree,
   fetchzip,
+  fetchFromGitHub,
   ffmpeg,
   fftw,
   fftwFloat,
@@ -48,6 +49,7 @@
   libxkbcommon,
   llvmPackages,
   makeWrapper,
+  manifold,
   mesa,
   nix-update-script,
   openUsdSupport ? !stdenv.hostPlatform.isDarwin,
@@ -72,7 +74,7 @@
   spaceNavSupport ? stdenv.hostPlatform.isLinux,
   sse2neon,
   stdenv,
-  tbb,
+  tbb_2022,
   vulkan-headers,
   vulkan-loader,
   wayland,
@@ -100,26 +102,27 @@ let
     patches = (old.patches or [ ]) ++ [ ./libdecor.patch ];
   });
 
-  optix = fetchzip {
-    # Look at upstream Blender BuildBot logs to determine the current version,
-    # see Git blame here for historical details
-    url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip";
-    hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY=";
+  # See build_files/config/pipeline_config.yaml in upstream source for version
+  optix = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "optix-dev";
+    tag = "v8.0.0";
+    hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY=";
   };
+
+  tbb = tbb_2022;
 in
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.4.3";
+  version = "4.5.0";
 
   src = fetchzip {
     name = "source";
     url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg=";
+    hash = "sha256-ERT/apulQ9ogA7Uk/AfjBee0rLjxEXItw6GwDOoysXk=";
   };
 
-  patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
-
   postPatch =
     (lib.optionalString stdenv.hostPlatform.isDarwin ''
       : > build_files/cmake/platform/platform_apple_xcode.cmake
@@ -247,13 +250,14 @@ stdenv'.mkDerivation (finalAttrs: {
       libsndfile
       libtiff
       libwebp
+      (manifold.override { tbb_2021 = tbb; })
       opencolorio
       openexr
       openimageio_2
       openjpeg
-      openpgl
+      (openpgl.override { inherit tbb; })
       (opensubdiv.override { inherit cudaSupport; })
-      openvdb
+      (openvdb.override { inherit tbb; })
       potrace
       pugixml
       python3
@@ -263,7 +267,7 @@ stdenv'.mkDerivation (finalAttrs: {
       zstd
     ]
     ++ lib.optional embreeSupport embree
-    ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
+    ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; })
     ++ (
       if (!stdenv.hostPlatform.isDarwin) then
         [

From fa478f30cd0569fc300b967c6a24a49ed5b8f7c6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 19 Jul 2025 21:21:27 -0400
Subject: [PATCH 3/3] blender: mark as broken on darwin

---
 pkgs/by-name/bl/blender/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 8dde30b3e814..d5c20f992107 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -423,6 +423,7 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    broken = stdenv.hostPlatform.isDarwin;
     description = "3D Creation/Animation/Publishing System";
     homepage = "https://www.blender.org";
     # They comment two licenses: GPLv2 and Blender License, but they