From 481a764f8f860dde4d664ec9d83724fd4a9631e6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 13 Jun 2015 15:22:47 +0200
Subject: [PATCH 1/2] dconf-editor: fix icons on non-nixos

---
 pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
index 06c01d305f84..e69bcd390329 100644
--- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
   };
 
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
                   intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
 
   preFixup = ''
     wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From ccb32c96c4f00f5296e697e7c316f8a72e216355 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 13 Jun 2015 15:27:42 +0200
Subject: [PATCH 2/2] gnome-bluetooth: fix icons on non-nixos

---
 .../gnome-3/3.16/core/gnome-bluetooth/default.nix     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
index ab8f380f672a..5b7d7c19d296 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2 }:
+, udev, itstool, libxml2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gnome-bluetooth-${gnome3.version}.1";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
   };
 
-  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
-                               gsettings_desktop_schemas itstool ];
+  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
+                               makeWrapper gsettings_desktop_schemas itstool ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/bluetooth-sendto" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;