gnome3: Setup hook for gdk-pixbuf and gnome-icon-theme

Add necessary paths to the environment so that
applications can find icons.

1 files changed, 10 insertions, 8 deletions

diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index b905a05474d3..07805644d906 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2, gnome3 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
+{ stdenv, intltool, fetchurl, vala, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "baobab-3.10.1";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz";
+    url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz";
     sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
   };
 
@@ -19,15 +18,18 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+  installFlags = "gsettingsschemadir=\${out}/share/baobab/glib-2.0/schemas/";
 
   postInstall = ''
     wrapProgram "$out/bin/baobab" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/baobab:$XDG_ICON_DIRS"
   '';
 
   preFixup = ''