about summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager-applet
diff options
context:
space:
mode:
authorMoritz Maxeiner <moritz@ucworks.org>2014-06-26 19:41:43 +0200
committerRob Vermaas <rob.vermaas@gmail.com>2014-06-27 10:25:30 +0200
commita229294c130f471afa3333d9679466688b3923d8 (patch)
treee76fe102e9ac618375c76434eaff93889153a1cf /pkgs/tools/networking/network-manager-applet
parentc00f589ff23dbef89dfebf69c118f3f59ba7fc26 (diff)
downloadnixlib-a229294c130f471afa3333d9679466688b3923d8.tar
nixlib-a229294c130f471afa3333d9679466688b3923d8.tar.gz
nixlib-a229294c130f471afa3333d9679466688b3923d8.tar.bz2
nixlib-a229294c130f471afa3333d9679466688b3923d8.tar.lz
nixlib-a229294c130f471afa3333d9679466688b3923d8.tar.xz
nixlib-a229294c130f471afa3333d9679466688b3923d8.tar.zst
nixlib-a229294c130f471afa3333d9679466688b3923d8.zip
Fix network-manager-applet startup issue 'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.'
(cherry picked from commit 51dc1ddb7c6e974e36c1a2d8701fbc7c254cbc72)

Conflicts:
	pkgs/tools/networking/network-manager-applet/default.nix
Diffstat (limited to 'pkgs/tools/networking/network-manager-applet')
-rw-r--r--pkgs/tools/networking/network-manager-applet/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 352a908c1d7e..850981c5d338 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -2,7 +2,7 @@
 , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring 
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
 , makeWrapper, networkmanager_openvpn, networkmanager_vpnc
-, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme }:
+, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }:
 
 let
   pn = "network-manager-applet";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"