diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2021-07-08 02:20:26 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2021-07-08 02:22:15 +0200 |
| commit | b7dd636f2475cd199d12cce672390f998f8c81bd (patch) | |
| tree | 475ba2b9e0315fd8727b42f38bf5901128d8ab98 /pkgs/tools/admin/turbovnc | |
| parent | 46c8ac79dbc9a4bcb7db4592d4708fb009284e13 (diff) | |
| download | nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.tar nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.tar.gz nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.tar.bz2 nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.tar.lz nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.tar.xz nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.tar.zst nixlib-b7dd636f2475cd199d12cce672390f998f8c81bd.zip | |
turbovnc: Fix that setting JAVA_HOME breaks vncviewer. Fixes #129582
Diffstat (limited to 'pkgs/tools/admin/turbovnc')
| -rw-r--r-- | pkgs/tools/admin/turbovnc/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 33d248ffde88..c0af38e10f3b 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -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 ]} ''; |