blender: sync to master

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
2024-07-11 20:21:34 +02:00
parent 5825227c8d
commit 3ba9d87219

View File

@@ -134,12 +134,12 @@ stdenv.mkDerivation (finalAttrs: {
'' ''
else 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 '' + (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 '"/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/bin"' '"${rocmPackages.clr}/bin"'
''); '');
env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";