[Nix-dev] [PATCH 1/2] Add Xfce Terminal emulator.

[David Brown]

Adds the terminal emulator, and the libraries that it depends upon.
---
 .../xfce-4/applications/terminal/default.nix       |   24 +++++++++++++++++
 pkgs/desktops/xfce-4/core/libexo/default.nix       |   23 ++++++++++++++++
 pkgs/desktops/xfce-4/core/libxfce4util/default.nix |   20 ++++++++++++++
 pkgs/desktops/xfce-4/default.nix                   |   28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |    3 ++
 5 files changed, 98 insertions(+), 0 deletions(-)
 create mode 100644 pkgs/desktops/xfce-4/applications/terminal/default.nix
 create mode 100644 pkgs/desktops/xfce-4/core/libexo/default.nix
 create mode 100644 pkgs/desktops/xfce-4/core/libxfce4util/default.nix
 create mode 100644 pkgs/desktops/xfce-4/default.nix

diff --git a/pkgs/desktops/xfce-4/applications/terminal/default.nix b/pkgs/desktops/xfce-4/applications/terminal/default.nix
new file mode 100644
index 0000000..8a05d99
--- /dev/null
+++ b/pkgs/desktops/xfce-4/applications/terminal/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl
+, pkgconfig, ncurses
+, intltool, vte
+, libexo, libxfce4util
+, gtk
+}:
+
+stdenv.mkDerivation {
+  name = "xfce-terminal-0.4.4";
+  src = fetchurl {
+    url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.4.tar.bz2;
+    sha256 = "1cmkrzgi2j5dgb1jigdqigf7fa84hh9l2bclgxzn17168cwpd1lw";
+  };
+
+  buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
+
+  CPPFLAGS = "-I${libexo}/include/exo-0.3 -I{libxfce4util}/include/xfce4";
+
+  meta = {
+    homepage = http://www.xfce.org/projects/terminal;
+    description = "A modern terminal emulator primarily for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/libexo/default.nix b/pkgs/desktops/xfce-4/core/libexo/default.nix
new file mode 100644
index 0000000..837bf5b
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/libexo/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl
+, pkgconfig
+, intltool
+, URI
+, glib, gtk
+, libxfce4util
+}:
+
+stdenv.mkDerivation {
+  name = "libexo-0.3.106";
+  src = fetchurl {
+    url = http://archive.xfce.org/src/xfce/exo/0.3/exo-0.3.106.tar.bz2;
+    sha256 = "1n823ipqdz47kxq6fwry3zza3j9ap7gikwm4s8169297xcjqd6qb";
+  };
+
+  buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ];
+
+  meta = {
+    homepage = http://www.xfce.org/projects/exo;
+    description = "Application library for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/libxfce4util/default.nix b/pkgs/desktops/xfce-4/core/libxfce4util/default.nix
new file mode 100644
index 0000000..f47cb44
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/libxfce4util/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl
+, pkgconfig
+, glib
+}:
+
+stdenv.mkDerivation {
+  name = "libxfce4util-4.6.1";
+  src = fetchurl {
+    url = http://www.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2;
+    sha256 = "0sy1222s0cq8zy2ankrp1747b6fg5jjahxrddih4gxc97iyxrv6f";
+  };
+
+  buildInputs = [ pkgconfig glib ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Basic utility non-GUI functions for Xfce";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
new file mode 100644
index 0000000..76aa608
--- /dev/null
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -0,0 +1,28 @@
+pkgs:
+rec {
+  inherit (pkgs.gtkLibs) gtk;
+
+  #### CORE
+
+  libexo = import ./core/libexo {
+    inherit (pkgs) stdenv fetchurl pkgconfig;
+    inherit (pkgs.gnome) intltool;
+    inherit (pkgs.perlPackages) URI;
+    inherit (pkgs.gtkLibs) glib gtk;
+    inherit libxfce4util;
+  };
+
+  libxfce4util = import ./core/libxfce4util {
+    inherit (pkgs) stdenv fetchurl pkgconfig;
+    inherit (pkgs.gtkLibs) glib;
+  };
+
+  #### APPLICATIONS
+  terminal = import ./applications/terminal {
+    inherit (pkgs) stdenv fetchurl pkgconfig ncurses;
+    inherit (pkgs.gnome) intltool vte;
+    inherit (pkgs.gtkLibs) gtk;
+    inherit libexo libxfce4util;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72ecc02..876bdc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9177,6 +9177,9 @@ let
     stdenv = stdenv2;
   });
 
+  xfce = xfce4;
+  xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
+
   ### SCIENCE
 
   xplanet = import ../applications/science/xplanet {
-- 
1.7.1