From d92de35181ffc884a7f88dab44d0610f1141daec Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 25 Jul 2026 15:23:38 +0200 Subject: [PATCH] ocelot-desktop: avoid putting empty segments in PATH and LD_LIBRARY_PATH --- pkgs/by-name/oc/ocelot-desktop/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix index 16e9fc6d3c1a..683a8384d9c9 100644 --- a/pkgs/by-name/oc/ocelot-desktop/package.nix +++ b/pkgs/by-name/oc/ocelot-desktop/package.nix @@ -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