From 3ba9d872190c8d98407efab2828ab3f69f51714b Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 11 Jul 2024 20:21:34 +0200 Subject: [PATCH] blender: sync to master Signed-off-by: Florian Brandes --- pkgs/applications/misc/blender/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index d53ddef8bec7..bb5a0b660086 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./draco.patch (fetchpatch { - url = " https://projects.blender.org/blender/blender/commit/ae35b5758791bebb21741f9b505b9fca347ae50e.patch"; + url = "https://projects.blender.org/blender/blender/commit/ae35b5758791bebb21741f9b505b9fca347ae50e.patch"; hash = "sha256-xUi55+7aiwEjtjqOi8to1YxdPlsBUThCCkCa5T6LIQc="; }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; @@ -134,12 +134,12 @@ stdenv.mkDerivation (finalAttrs: { '' else '' - substituteInPlace extern/clew/src/clew.c --replace-fail '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' + substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' '' ) + (lib.optionalString hipSupport '' - substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' - substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' + substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' + substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' ''); env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";