Override glib_networking with gnome 3.12 scope

2 files changed, 24 insertions, 8 deletions

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4398a97ff47d..78ab7aee92bb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -101,11 +101,11 @@ in {
       };
 
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
-                                                "${pkgs.glib_networking}/lib/gio/modules" ];
+                                                "${gnome3.glib_networking}/lib/gio/modules" ];
     environment.systemPackages =
       [ pkgs.desktop_file_utils
-        pkgs.glib_networking
-        pkgs.gtk3 # for gtk-update-icon-cache
+        gnome3.glib_networking
+        gnome3.gtk3 # for gtk-update-icon-cache
         pkgs.ibus
         pkgs.shared_mime_info # for update-mime-database
         gnome3.dconf
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 49bf62160fac..0600b4ebbf91 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -44,6 +44,10 @@ rec {
 
   gjs = callPackage ./core/gjs { };
 
+  glib_networking = pkgs.glib_networking.override {
+    inherit gsettings_desktop_schemas;
+  };
+
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
   gnome-contacts = callPackage ./core/gnome-contacts { };
@@ -134,15 +138,27 @@ rec {
 
   nautilus = callPackage ./core/nautilus { };
 
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override { inherit gnome3; };
+  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
+    inherit gnome3;
+  };
 
-  networkmanager_pptp = pkgs.networkmanager_pptp.override { inherit gnome3; };
+  networkmanager_pptp = pkgs.networkmanager_pptp.override {
+    inherit gnome3;
+  };
 
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override { inherit gnome3; };
+  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
+    inherit gnome3;
+  };
 
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override { inherit gnome3; };
+  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
+    inherit gnome3;
+  };
 
-  networkmanagerapplet = pkgs.networkmanagerapplet.override { inherit gnome3; };
+  networkmanagerapplet = pkgs.networkmanagerapplet.override {
+    inherit gnome3 gsettings_desktop_schemas glib_networking
+      networkmanager_openvpn networkmanager_pptp networkmanager_vpnc
+      networkmanager_openconnect;
+  };
 
   rest = callPackage ./core/rest { };