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

turbovnc: Fix that setting JAVA_HOME breaks vncviewer. Fixes #129582

Browse Source
This commit is contained in:
Niklas Hambüchen 2021-07-08 02:20:26 +02:00
parent 46c8ac79db
commit b7dd636f24
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/admin/turbovnc/default.nix
View File

@ -95,10 +95,11 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/vncserver \
--prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])}
# The viewer is in Java and requires `JAVA_HOME`.
# The viewer is in Java and requires `JAVA_HOME` (which is a single
# path, cannot be multiple separated paths).
# For SSH support, `ssh` is required on `PATH`.
wrapProgram $out/bin/vncviewer \
--prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \
--set JAVA_HOME "${lib.makeLibraryPath [ openjdk ]}/openjdk" \
--prefix PATH : ${lib.makeBinPath [ openssh ]}
'';