From f3867899ee48b679f9a1d43fccef1679039b7644 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 May 2015 18:51:43 +0200 Subject: [PATCH] tightvnc: replace occurences to /usr/bin/ssh closes #3669 --- pkgs/tools/admin/tightvnc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index d6b0e80ea62..a1a091a90cc 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu -, libXaw, libXpm, libXp , perl, xauth, fontDirectories }: +, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { name = "tightvnc-1.3.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { gcc = stdenv.cc.cc; buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw - libXpm libXp xauth ]; + libXpm libXp xauth openssh ]; patchPhase = '' fontPath= @@ -23,6 +23,8 @@ stdenv.mkDerivation { addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) done done + + sed -i "s@/usr/bin/ssh@${openssh}/bin/ssh@g" vncviewer/vncviewer.h ''; buildPhase = ''