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

Merge pull request #129605 from NixOS/backport-129590-to-release-21.05

Browse Source 
[Backport release-21.05] turbovnc: Fix that setting JAVA_HOME breaks vncviewer. Fixes #129582
This commit is contained in:
Jörg Thalheim 2021-07-08 07:12:12 +01:00 committed by GitHub
commit fa5cb7a31d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 \ wrapProgram $out/bin/vncserver \
--prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])} --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`. # For SSH support, `ssh` is required on `PATH`.
wrapProgram $out/bin/vncviewer \ wrapProgram $out/bin/vncviewer \
--prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ --set JAVA_HOME "${lib.makeLibraryPath [ openjdk ]}/openjdk" \
--prefix PATH : ${lib.makeBinPath [ openssh ]} --prefix PATH : ${lib.makeBinPath [ openssh ]}
''; '';