Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'

1 files changed, 13 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 6a5d2fde5018..134ba41d6534 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, apacheHttpd, nautilus
-, pkgconfig, gtk3, glib, libxml2, systemd
+, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme
 , wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
 , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
   preConfigure = ''
     sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
@@ -26,15 +26,19 @@ stdenv.mkDerivation rec {
       -i data/dav_user_2.4.conf
   '';
 
-  configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd.dev}/modules"
-                     "--with-systemduserunitdir=$(out)/etc/systemd/user"
-                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+  configureFlags = [
+    "--with-httpd=${apacheHttpd.out}/bin/httpd"
+    "--with-modules-path=${apacheHttpd.dev}/modules"
+    "--with-systemduserunitdir=$(out)/etc/systemd/user"
+    "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0"
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
-                  wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  nautilus libnotify libcanberra-gtk3 systemd ];
+  buildInputs = [
+    gtk3 glib intltool itstool libxml2 libtool
+    wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg
+    nautilus libnotify libcanberra-gtk3 systemd
+  ];
 
   postInstall = ''
     mkdir -p $out/share/gsettings-schemas/$name