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
This commit is contained in:
Moritz Maxeiner 2014-06-26 19:41:43 +02:00 committed by Rob Vermaas
parent c00f589ff2
commit a229294c13
2 changed files with 3 additions and 3 deletions

View File

@ -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"

View File

@ -1605,7 +1605,7 @@ let
networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };
newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };