* Add some more Xfce packages.

svn path=/nixpkgs/trunk/; revision=23054

8 files changed, 108 insertions, 11 deletions

diff --git a/pkgs/desktops/xfce-4/core/libxfce4util.nix b/pkgs/desktops/xfce-4/core/libxfce4util.nix
index e6565467e4c3..2625966bb587 100644
--- a/pkgs/desktops/xfce-4/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce-4/core/libxfce4util.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.xfce.org/;
     description = "Basic utility non-GUI functions for Xfce";
-    license = "GPLv2";
+    license = "bsd";
   };
 }
diff --git a/pkgs/desktops/xfce-4/core/libxfcegui4.nix b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
index e5944510b400..01913a3df596 100644
--- a/pkgs/desktops/xfce-4/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
@@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
 
   # By default, libxfcegui4 tries to install into libglade's prefix.
   # Install into our own prefix instead.
-  configureFlags = "--with-libglade-module-path=$(out)/lib/libglade/2.0";
+  preConfigure =
+    ''
+      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
+    '';
 
   buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade ];
 
   meta = {
     homepage = http://www.xfce.org/;
     description = "Basic GUI library for Xfce";
-    license = "GPLv2";
+    license = "LGPLv2+";
   };
 }
diff --git a/pkgs/desktops/xfce-4/core/xfce-utils.nix b/pkgs/desktops/xfce-4/core/xfce-utils.nix
new file mode 100644
index 000000000000..4f520058ccf1
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce-utils.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 }:
+
+stdenv.mkDerivation rec {
+  name = "xfce-utils-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "6373886c3d70e576859741bde747a235567ffd8e";
+  };
+
+  configureFlags = "--with-xsession-prefix=$(out)/share/xsessions";
+
+  buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Utilities and scripts for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfce4-panel.nix b/pkgs/desktops/xfce-4/core/xfce4-panel.nix
new file mode 100644
index 000000000000..db2e046dd6a7
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce4-panel.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, exo, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-panel-4.6.4";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 exo libwnck
+      libstartup_notification
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce panel";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfce4-session.nix b/pkgs/desktops/xfce-4/core/xfce4-session.nix
new file mode 100644
index 000000000000..dc563502542a
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce4-session.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, dbus_glib, xfconf, libglade, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-session-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      xfconf libglade xorg.iceauth
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Session manager for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfdesktop.nix b/pkgs/desktops/xfce-4/core/xfdesktop.nix
new file mode 100644
index 000000000000..c005e300e2f8
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfdesktop.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, xfconf, libglade }:
+
+stdenv.mkDerivation rec {
+  name = "xfdesktop-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf
+      libglade ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce desktop manager";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfwm4.nix b/pkgs/desktops/xfce-4/core/xfwm4.nix
index 20b33dcf4b40..27a34043cad8 100644
--- a/pkgs/desktops/xfce-4/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4/core/xfwm4.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.xfce.org/;
     description = "Window manager for Xfce";
-    license = "GPLv2";
+    license = "GPLv2+";
   };
 }
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index 23be21de2e4c..2aa25c19341b 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -7,29 +7,38 @@ rec {
 
   exo = callPackage ./core/exo.nix {
     inherit (pkgs.perlPackages) URI;
-    inherit (pkgs.gtkLibs) glib gtk;
   };
 
-  libxfce4util = callPackage ./core/libxfce4util.nix {
-    inherit (pkgs.gtkLibs) glib;
-  };
+  libxfce4util = callPackage ./core/libxfce4util.nix { };
 
   libxfcegui4 = callPackage ./core/libxfcegui4.nix {
     inherit (pkgs.gnome) libglade;
   };
 
-  xfconf = callPackage ./core/xfconf.nix {
-  };
+  xfconf = callPackage ./core/xfconf.nix { };
 
   xfwm4 = callPackage ./core/xfwm4.nix {
     inherit (pkgs.gnome) libglade libwnck;
   };
 
+  xfceutils = callPackage ./core/xfce-utils.nix { };
+
+  xfce4session = callPackage ./core/xfce4-session.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
+  xfce4panel = callPackage ./core/xfce4-panel.nix {
+    inherit (pkgs.gnome) libwnck;
+  };
+
+  xfdesktop = callPackage ./core/xfdesktop.nix {
+    inherit (pkgs.gnome) libwnck libglade;
+  };
+
   #### APPLICATIONS
   
   terminal = callPackage ./applications/terminal.nix {
     inherit (pkgs.gnome) vte;
-    inherit (pkgs.gtkLibs) gtk;
   };
 
 }