summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2015-05-21 18:51:43 +0200
committerPascal Wittmann <mail@pascal-wittmann.de>2015-05-21 18:53:45 +0200
commitf3867899ee48b679f9a1d43fccef1679039b7644 (patch)
tree10478ccbd90d4d1f66ecb7310521e0f9b524997d
parent691b98fc28f0383a8e0a2683f5827b2c47fc9f2c (diff)
downloadnixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.tar
nixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.tar.gz
nixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.tar.bz2
nixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.tar.lz
nixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.tar.xz
nixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.tar.zst
nixpkgs-f3867899ee48b679f9a1d43fccef1679039b7644.zip
tightvnc: replace occurences to /usr/bin/ssh
closes #3669
-rw-r--r--pkgs/tools/admin/tightvnc/default.nix6
1 files 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 = ''