From f764ef03144e6c62ddf4c3aa14fe53a01c0543f7 Mon Sep 17 00:00:00 2001 From: harlekin <5800926-mw102@users.noreply.gitlab.com> Date: Sun, 30 Jul 2023 21:34:11 +0000 Subject: [PATCH] add LD_LIBRARY_PATH to env --- src/main/java/com/sheepit/client/Job.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/sheepit/client/Job.java b/src/main/java/com/sheepit/client/Job.java index d58c7ad..54d854f 100644 --- a/src/main/java/com/sheepit/client/Job.java +++ b/src/main/java/com/sheepit/client/Job.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Map; import java.util.Observable; import java.util.Observer; +import java.util.Optional; import java.util.TimeZone; import java.util.Timer; import java.util.TimerTask; @@ -230,6 +231,11 @@ import java.util.regex.Pattern; new_env.put("BLENDER_SYSTEM_DATAFILES", ""); new_env.put("OCIO", ""); //prevent blender from loading a non-standard color configuration + // Add own lib folder first, because Steam or other environments may set an LD_LIBRARY_PATH that has priority over the runpath in the Blender excutable, + // but contains incompatible libraries. + String currentLDLibraryPath = Optional.ofNullable(System.getenv("LD_LIBRARY_PATH")).orElse(""); + new_env.put("LD_LIBRARY_PATH", getRendererDirectory() + "/lib" + ":" + currentLDLibraryPath); + for (String arg : command1) { switch (arg) { case ".c":