From 0de5cbedef310e3e8c2b4444db51d74673faf307 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Oct 2007 05:55:44 +0000
Subject: [PATCH] Corrected vncserver

svn path=/nixpkgs/trunk/; revision=9406
---
 pkgs/tools/admin/tightvnc/builder.sh  | 1 +
 pkgs/tools/admin/tightvnc/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh
index 5842400693c0..1b22238de4ee 100644
--- a/pkgs/tools/admin/tightvnc/builder.sh
+++ b/pkgs/tools/admin/tightvnc/builder.sh
@@ -4,6 +4,7 @@ buildPhase=buildPhase
 buildPhase() {
     xmkmf
     make World
+	sed -e 's@/usr/bin/perl@'$perl'/bin/perl@' -i vncserver
 
 	cd Xvnc
 	sed -e 's@.* CppCmd .*@#define CppCmd		'$gcc'/bin/cpp@' -i config/cf/linux.cf 
diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix
index a3fa7adc344c..779ee3452fd3 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/pkgs/tools/admin/tightvnc/default.nix
@@ -1,9 +1,10 @@
-{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp}:
+{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl}:
 
 stdenv.mkDerivation {
   name = "tightvnc-1.3.9";
   builder = ./builder.sh;
   gcc=stdenv.gcc.gcc;
+	inherit perl;
   src = fetchurl {
     url = mirror://sourceforge/vnc-tight/tightvnc-1.3.9_unixsrc.tar.bz2;
     sha256 = "0nij6kyzwxf7nblwd6riwqhzh8b8xwdffpj379zi5y9mcmiwmalr";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e72015c07fc3..c9402d23cc75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -670,7 +670,7 @@ rec {
   };
 
   tightvnc = import ../tools/admin/tightvnc {
-    inherit fetchurl stdenv x11 zlib libjpeg;
+    inherit fetchurl stdenv x11 zlib libjpeg perl;
     inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp;
   };