From 375526c382a74526e8b5caac2ef201b0fc305615 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 14 May 2007 00:51:30 +0000
Subject: [PATCH] remove gaim, clean up pidgin dependencies a bit

svn path=/nixpkgs/trunk/; revision=8683
---
 .../instant-messengers/gaim/builder.sh        |  9 -------
 .../instant-messengers/gaim/default.nix       | 27 -------------------
 .../instant-messengers/pidgin/default.nix     |  4 +--
 pkgs/top-level/all-packages.nix               |  7 +----
 4 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/gaim/builder.sh
 delete mode 100644 pkgs/applications/networking/instant-messengers/gaim/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/gaim/builder.sh b/pkgs/applications/networking/instant-messengers/gaim/builder.sh
deleted file mode 100644
index 4ad985ce8004..000000000000
--- a/pkgs/applications/networking/instant-messengers/gaim/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-configureFlags="\
-  --with-nspr-includes=$nss/include/nspr \
-  --with-nspr-libs=$nss/lib \
-  --with-nss-includes=$nss/include/nss \
-  --with-nss-libs=$nss/lib"
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/applications/networking/instant-messengers/gaim/default.nix b/pkgs/applications/networking/instant-messengers/gaim/default.nix
deleted file mode 100644
index 36d63035e196..000000000000
--- a/pkgs/applications/networking/instant-messengers/gaim/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Possible missing configuration:
- *
- * - silcclient
- * - libstartup-notification
- * - libebook-1.2
- * - libedata-book-1.2
- * - checking for XScreenSaverRegister in -lXext... no
- * - checking for XScreenSaverRegister in -lXss... no
- * - gtkspell
- * - ao
- * - audiofile-config
- * - doxygen
- */
-{stdenv, fetchurl, pkgconfig, glib, gtk, perl, perlXMLParser, libxml2, openssl, nss}:
-
-stdenv.mkDerivation {
-  name = "gaim-2.0.0pre6";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/gaim/gaim-2.0.0beta6.tar.gz;
-    md5 = "0c7520d4ce083704d196c04c63dcd16a";
-  };
-
-  inherit nss;
-  buildInputs = [pkgconfig glib gtk perl perlXMLParser libxml2 openssl nss];
-}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index b85f232b6331..72241f2049e3 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -10,7 +10,7 @@
  * - audiofile-config
  * - doxygen
  */
-{ stdenv, fetchurl, pkgconfig, glib, gtk, gtkspell, aspell,
+{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
   GStreamer, startupnotification, gettext,
   perl, perlXMLParser, libxml2, openssl, nss,
   libXScrnSaver
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   inherit nss;
   buildInputs = [
-    pkgconfig glib gtk gtkspell aspell
+    pkgconfig gtk gtkspell aspell
     GStreamer startupnotification gettext
     perl perlXMLParser libxml2 openssl nss
     libXScrnSaver
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69471ab8424d..ea42553927bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2681,14 +2681,9 @@ rec {
     gtksharp = gtksharp1;
   };
 
-  gaim = import ../applications/networking/instant-messengers/gaim {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss;
-    inherit (gtkLibs) glib gtk;
-  };
-
   pidgin = import ../applications/networking/instant-messengers/pidgin {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext;
-    inherit (gtkLibs) glib gtk;
+    inherit (gtkLibs) gtk;
     inherit (gnome) startupnotification;
     inherit (xlibs) libXScrnSaver;
   };