gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blender: sync to master

Browse Source 
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
Florian Brandes
2024-07-11 20:21:34 +02:00
parent 5825227c8d
commit 3ba9d87219
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/blender/default.nix
View File

@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
./draco.patch ./draco.patch
(fetchpatch { (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="; hash = "sha256-xUi55+7aiwEjtjqOi8to1YxdPlsBUThCCkCa5T6LIQc=";
}) })
] ++ lib.optional stdenv.isDarwin ./darwin.patch; ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
@@ -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}";