Skip to content

blender: fix segfault when using both HIP and OSL #504149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frozolotl wants to merge 1 commit into from
Closed

blender: fix segfault when using both HIP and OSL #504149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pkgs/by-name/bl/blender/llvm-conflict.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/extern/hipew/src/util.h b/extern/hipew/src/util.h
index 2aafc4b7f9..b9ed1c0cd3 100644
--- a/extern/hipew/src/util.h
+++ b/extern/hipew/src/util.h
@@ -40,11 +40,12 @@
# define dynamic_library_close(lib) FreeLibrary(lib)
# define dynamic_library_find(lib, symbol) GetProcAddress(lib, symbol)
#else
+# define _GNU_SOURCE
# include <dlfcn.h>

typedef void* DynamicLibrary;

-# define dynamic_library_open(path) dlopen(path, RTLD_NOW)
+# define dynamic_library_open(path) dlmopen(LM_ID_NEWLM, path, RTLD_NOW)
# define dynamic_library_close(lib) dlclose(lib)
# define dynamic_library_find(lib, symbol) dlsym(lib, symbol)
#endif
5 changes: 4 additions & 1 deletion pkgs/by-name/bl/blender/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ stdenv'.mkDerivation (finalAttrs: {
};

# Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
patches = lib.optional rocmSupport ./hiprt-3-compat.patch;
patches = lib.optionals rocmSupport [
./hiprt-3-compat.patch
./llvm-conflict.patch
];

postPatch =
(lib.optionalString stdenv.hostPlatform.isDarwin ''
Expand Down
Loading