diff options
author | Jason Miller <jason@milr.com> | 2017-09-08 11:45:17 -0700 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-08 19:45:17 +0100 |
commit | e9183fd2d4d3bb222b2ce3492935ec26d207524a (patch) | |
tree | fa1b97124a362501e89063a98ed5f57fd3f73eee /pkgs/tools/admin | |
parent | 9f2ff1d31aee9a8c33c9896794d6ad3fd50a8d41 (diff) | |
download | nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.tar nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.tar.gz nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.tar.bz2 nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.tar.lz nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.tar.xz nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.tar.zst nixlib-e9183fd2d4d3bb222b2ce3492935ec26d207524a.zip |
tigervnc: correct default ssh client path (#29084)
* tigervnc: correct default ssh client path The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh upstream. This patches it to use the nixpkgs openssh client. * tigervnc: patch ssh path correctly
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3df01dccced8..369c2366fc14 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -5,7 +5,7 @@ , cmake, gettext, libtool , glproto, mesa_glu , gnutls, pam, nettle -, xterm }: +, xterm, openssh }: with stdenv.lib; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit fontDirectories; - patchPhase = '' + postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { done done sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver + substituteInPlace vncviewer/vncviewer.cxx \ + --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' ''; dontUseCmakeBuildDir = true; |