From ac711a705eb921460eb598480caca13b4ba68464 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Jul 2014 11:42:41 +0200
Subject: [PATCH] dfeet: fix icons

---
 pkgs/development/tools/misc/d-feet/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index d4847afc786..852c1b74219 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,7 +1,6 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, pango, gdk_pixbuf, atk, pep8, python, makeWrapper
-, pygobject3, gobjectIntrospection, libwnck3
-, gnome_icon_theme }:
+, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3
+, pygobject3, gobjectIntrospection, libwnck3 }:
 
 let
   version = "${major}.8";
@@ -18,16 +17,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
+    gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
     makeWrapper pygobject3 libwnck3
   ];
 
-  postInstall =
+  preFixup =
     ''
       wrapProgram $out/bin/d-feet \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \
-        --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
+
+      rm $out/share/icons/hicolor/icon-theme.cache
     '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a043912dc8b..40640320276 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3869,7 +3869,6 @@ let
 
   dfeet = callPackage ../development/tools/misc/d-feet {
     inherit (pythonPackages) pep8;
-    inherit (gnome3) gnome_icon_theme;
   };
 
   dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };