From 0dfd245a17d2d0ccf5a5b274db88c7ae873812b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 20:36:37 +0000
Subject: [PATCH] * Add thunar-volman and gvfs.

svn path=/nixpkgs/trunk/; revision=29043
---
 pkgs/desktops/xfce-4.8/core/thunar-volman.nix | 24 +++++++++++++++++++
 pkgs/desktops/xfce-4.8/default.nix            | 14 +++++++++++
 pkgs/desktops/xfce-4.8/support/gvfs.nix       | 12 ++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/desktops/xfce-4.8/core/thunar-volman.nix
 create mode 100644 pkgs/desktops/xfce-4.8/support/gvfs.nix

diff --git a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
new file mode 100644
index 000000000000..ac47b49f0be3
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, xfconf, udev, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "thunar-volman-0.6.0";
+  
+  src = fetchurl {
+    url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2";
+    sha1 = "dcda936948623b342b290a78c294f71c038e832e";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
+      xfconf libnotify
+    ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://thunar.xfce.org/;
+    description = "Thunar extension for automatic management of removable drives and media";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix
index 57098b12e3e9..821a8e92faba 100644
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@@ -3,6 +3,16 @@
 rec {
   inherit (pkgs.gtkLibs) gtk glib;
 
+  #### SUPPORT
+
+  #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { };  
+
+  # Gvfs is required by Thunar for the trash feature and for volume
+  # mounting.  Should use the one from Gnome, but I don't want to mess
+  # with the Gnome packages (or pull in a zillion Gnome dependencies).
+  gvfs = callPackage ./support/gvfs.nix { };
+
+  
   #### CORE
 
   libxfce4util = callPackage ./core/libxfce4util.nix { };
@@ -43,10 +53,13 @@ rec {
 
   thunar = callPackage ./core/thunar.nix { };
 
+  thunar_volman = callPackage ./core/thunar-volman.nix { };
+
   gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
 
   # !!! Add xfce4-appfinder
 
+  
   #### APPLICATIONS
   
   terminal = callPackage ./applications/terminal.nix {
@@ -61,6 +74,7 @@ rec {
 
   xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
 
+  
   #### ART
 
   xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix
new file mode 100644
index 000000000000..880ca745b7a7
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }:
+
+stdenv.mkDerivation rec {
+  name = "gvfs-1.8.2";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2";
+    sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
+  };
+
+  buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
+}