From 7008d7bfd91e83bc9f7ede24e098c87d87794783 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2007 23:37:34 +0000
Subject: [PATCH] * Gnome terminal.

svn path=/nixpkgs/trunk/; revision=8172
---
 pkgs/desktops/gnome/default.nix         | 15 ++++++++++++++-
 pkgs/desktops/gnome/gnome-doc-utils.nix |  2 ++
 pkgs/desktops/gnome/gnome-terminal.nix  | 18 ++++++++++++++++++
 pkgs/desktops/gnome/vte.nix             | 13 +++++++++++++
 pkgs/top-level/all-packages.nix         |  8 ++++++--
 5 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/gnome/gnome-terminal.nix
 create mode 100644 pkgs/desktops/gnome/vte.nix

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index b56e71d525fb..8bbbe071597e 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -3,7 +3,8 @@
 { stdenv, fetchurl, pkgconfig, audiofile
 , flex, bison, popt, perl, zlib, libxml2, libxslt
 , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg
-, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib
+, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses
+, which, libxml2Python
 }:
 
 assert dbus_glib.glib == gtkLibs.glib;
@@ -211,6 +212,18 @@ rec {
       gettext libxslt;
     input = desktop.gconfeditor;
   };
+
+  vte = import ./vte.nix {
+    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser ncurses
+      python gettext;
+    input = desktop.vte;
+  };
+  
+  gnometerminal = import ./gnome-terminal.nix {
+    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
+      gettext which python libxml2Python libxslt;
+    input = desktop.gnometerminal;
+  };
   
 };
 
diff --git a/pkgs/desktops/gnome/gnome-doc-utils.nix b/pkgs/desktops/gnome/gnome-doc-utils.nix
index 47d211be0cbc..f1650d9650a8 100644
--- a/pkgs/desktops/gnome/gnome-doc-utils.nix
+++ b/pkgs/desktops/gnome/gnome-doc-utils.nix
@@ -2,6 +2,8 @@
 , libxml2, libxslt, gettext
 }:
 
+# !!! xml2po needs to store the path to libxml2
+
 stdenv.mkDerivation {
   inherit (input) name src;
   
diff --git a/pkgs/desktops/gnome/gnome-terminal.nix b/pkgs/desktops/gnome/gnome-terminal.nix
new file mode 100644
index 000000000000..81a8a0f4d145
--- /dev/null
+++ b/pkgs/desktops/gnome/gnome-terminal.nix
@@ -0,0 +1,18 @@
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
+, gettext, which, python, libxml2Python, libxslt
+}:
+
+# !!! should get rid of libxml2Python, see gnomedocutils
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  
+  buildInputs = [
+    pkgconfig perl perlXMLParser gnome.gtk gnome.GConf gnome.libglade
+    gnome.libgnomeui gnome.startupnotification gnome.gnomevfs gnome.vte
+    gnome.gnomedocutils gettext which gnome.scrollkeeper
+    python libxml2Python libxslt
+  ];
+
+  configureFlags = "--disable-scrollkeeper";
+}
diff --git a/pkgs/desktops/gnome/vte.nix b/pkgs/desktops/gnome/vte.nix
new file mode 100644
index 000000000000..dc79027e84e5
--- /dev/null
+++ b/pkgs/desktops/gnome/vte.nix
@@ -0,0 +1,13 @@
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
+, ncurses, python, gettext
+}:
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  
+  buildInputs = [
+    pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext
+  ];
+  
+  propagatedBuildInputs = [ncurses];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 963267fe67bb..17223639ce8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1550,10 +1550,14 @@ rec {
 
   libxml2 = import ../development/libraries/libxml2 {
     inherit fetchurl stdenv zlib python;
-#    pythonSupport = stdenv.system == "i686-linux";
     pythonSupport = false;
   };
 
+  libxml2Python = import ../development/libraries/libxml2 {
+    inherit fetchurl stdenv zlib python;
+    pythonSupport = true;
+  };
+
   libxslt = import ../development/libraries/libxslt {
     inherit fetchurl stdenv libxml2;
   };
@@ -3017,7 +3021,7 @@ rec {
             flex bison popt zlib libxml2 libxslt
             perl perlXMLParser docbook_xml_dtd_42 gettext x11
             libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm
-            python dbus_glib;
+            python dbus_glib ncurses which libxml2Python;
   });
 
   kdelibs = import ../desktops/kde/kdelibs {