diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 20:48:14 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 20:48:14 +0200 |
commit | febd5e323d08db5912e33d247a5f12275277dfb6 (patch) | |
tree | f50a941c9a2b6b52983d12ea371ad2118b058e42 /pkgs/tools/admin/tigervnc | |
parent | 0061fae2e6fd62f6d2a76418b62815bd49add51c (diff) | |
parent | e9183fd2d4d3bb222b2ce3492935ec26d207524a (diff) |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
-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 33731688cac3d..bb585f6eb64ae 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; |