ocelot-desktop: avoid putting empty segments in PATH and LD_LIBRARY_PATH (#545608)

2026-07-25 14:42:52 +00:00
parent 10b08b8854 d92de35181
commit 2252d3e2ad
1 changed files with 7 additions and 3 deletions
@@ -81,9 +81,13 @@ stdenv.mkDerivation (finalAttrs: {
      install -Dm644 ${finalAttrs.src} $out/share/ocelot-desktop/ocelot-desktop.jar

      makeBinaryWrapper ${jre}/bin/java $out/bin/ocelot-desktop \
-        --set JAVA_HOME ${jre.home} \
-        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \
-        --prefix PATH : "${lib.makeBinPath runtimePrograms}" \
+        --set JAVA_HOME ${jre.home} ${
+          lib.optionalString (
+            runtimeLibs != [ ]
+          ) "--prefix LD_LIBRARY_PATH : \"${lib.makeLibraryPath runtimeLibs}\""
+        } ${
+          lib.optionalString (runtimePrograms != [ ]) "--prefix PATH : \"${lib.makeBinPath runtimePrograms}\""
+        } \
        --add-flags "-jar $out/share/ocelot-desktop/ocelot-desktop.jar"

      # copy icons from zip file