From 58a0309aee0f522306994cd83d882f575018f2d0 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 30 Dec 2024 20:43:53 -0500 Subject: [PATCH] blender: use stdenv from cudaPackages when building with CUDA (#368896) Otherwise stdenv may have an incompatible compiler, as is currently the case, so this fixes the build with cudaSupport. --- 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 f486a8e6dcff..2df2e3a08805 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -88,6 +88,8 @@ }: let + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; + embreeSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; openImageDenoiseSupport = @@ -110,7 +112,7 @@ let }; in -stdenv.mkDerivation (finalAttrs: { +stdenv'.mkDerivation (finalAttrs: { pname = "blender"; version = "4.3.2";