From 2514c860333efb66ec33f7de4b46a45db91ac115 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 18 Mar 2008 19:45:31 +0000
Subject: [PATCH] reverted diff r11163-11164 (rgb not needed for tightvnc)

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

diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix
index 8b6f3b3835c4..ad8fa50a299c 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/pkgs/tools/admin/tightvnc/default.nix
@@ -1,5 +1,4 @@
-# hint: don't forget to start xfs font server (configuration.nix)
-{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth, rgb}:
+{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth}:
 
 stdenv.mkDerivation {
   name = "tightvnc-1.3.9";
@@ -11,5 +10,5 @@ stdenv.mkDerivation {
     sha256 = "0nij6kyzwxf7nblwd6riwqhzh8b8xwdffpj379zi5y9mcmiwmalr";
   };
   buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp
-  	xauth rgb];
+  	xauth];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b10191f17c45..4cb47b25bf00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1007,7 +1007,7 @@ let pkgs = rec {
 
   tightvnc = import ../tools/admin/tightvnc {
     inherit fetchurl stdenv x11 zlib libjpeg perl;
-    inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp xauth rgb;
+    inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp xauth;
   };
 
   time = import ../tools/misc/time {