From a218b2d3cb1ba9c450b2513cfe7e2f85998144b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 16:10:34 +0200
Subject: [PATCH] xfce: Fix missing icons

Xfce didn't have a default value for its icon theme, so most icons
were missing until the user explicitly selected an icon theme in the
appearance settings.  Example:

  http://hydra.nixos.org/build/5717570/download/1/screen.png

This patch sets the Rodent theme as the default (which used to be the
case on NixOS).

http://lists.freebsd.org/pipermail/freebsd-ports/2012-June/076349.html
http://www.freebsd.org/cgi/query-pr.cgi?pr=168688
---
 .../core/xfce4-settings-default-icon-theme.patch     | 12 ++++++++++++
 pkgs/desktops/xfce/core/xfce4-settings.nix           |  6 +++++-
 pkgs/desktops/xfce/default.nix                       |  2 --
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch

diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
new file mode 100644
index 000000000000..51ac265dcb1f
--- /dev/null
+++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml	2013-05-05 18:12:54.000000000 +0200
++++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml	2013-08-15 15:57:48.538586286 +0200
+@@ -7,7 +7,7 @@
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+     <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="IconThemeName" type="string" value="Rodent"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix
index d597237e32b2..2e76b22510f9 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings.nix
@@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi";
   };
+
   name = "${p_name}-${ver_maj}.${ver_min}";
 
+  patches = [ ./xfce4-settings-default-icon-theme.patch ];
+
   buildInputs =
     [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade
       xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
-    #gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      #gtk libxfce4util libxfcegui4 libwnck dbus_glib
       #xfconf libglade xorg.iceauth
     ];
+
   configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
 
   meta = {
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index e5daaca9d528..7ac61abb87bb 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -48,12 +48,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
   xfce4terminal   = callPackage ./applications/terminal.nix { };
 
-
   #### ART                  from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"
 
   xfce4icontheme  = callPackage ./art/xfce4-icon-theme.nix { };
 
-
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"
 
   xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };