Merge branch 'master.upstream' into staging.upstream

pkgs/desktops/xfce/applications/mousepad.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, libxfce4util
-, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }:
+, gtk, gtksourceview, dbus, dbus_glib, makeWrapper
+, dconf }:
 
 stdenv.mkDerivation rec {
   p_name  = "mousepad";
@@ -15,11 +16,13 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig intltool libxfce4util
       gtk gtksourceview dbus dbus_glib makeWrapper
+      dconf
     ];
 
   preFixup = ''
     wrapProgram "$out/bin/mousepad" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
+      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
   '';
 
   meta = {

pkgs/desktops/xfce/default.nix

@@ -6,6 +6,7 @@ callPackage = newScope (deps // xfce_self);
 
 deps = { # xfce-global dependency overrides should be here
   inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
+  inherit (pkgs.gnome3) dconf;
   inherit (pkgs.perlPackages) URI;
 };