about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-09-02 13:53:11 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-09-03 03:48:06 +0200
commitfa03881954a0957522785dc5c52f45d07cdae87d (patch)
treeeb67cb962b07cbd5491daeb75c2276e09d7c409d /pkgs/desktops
parent6fabbe513b72cb87b552d292d1f0438ad65a4d56 (diff)
downloadnixlib-fa03881954a0957522785dc5c52f45d07cdae87d.tar
nixlib-fa03881954a0957522785dc5c52f45d07cdae87d.tar.gz
nixlib-fa03881954a0957522785dc5c52f45d07cdae87d.tar.bz2
nixlib-fa03881954a0957522785dc5c52f45d07cdae87d.tar.lz
nixlib-fa03881954a0957522785dc5c52f45d07cdae87d.tar.xz
nixlib-fa03881954a0957522785dc5c52f45d07cdae87d.tar.zst
nixlib-fa03881954a0957522785dc5c52f45d07cdae87d.zip
gnome3.glib-networking: replace with alias
Since we moved gsettings-desktop-schemas to top-level, gnome3.glib-networking was the same as glib-networking.
We could try to make the top-level variant not depend on gsettings-desktop-schemas again but that is probably
pointless, as the dependency is rather small compared to things like libproxy. Instead, we will just drop
the package in gnome3 attr set and always rely on the top-level expression.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 87bf2b7fe70f..21ecc7e64ee4 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gjs = callPackage ./core/gjs { };
 
-  glib-networking = pkgs.glib-networking.override {
-    inherit (pkgs) gsettings-desktop-schemas;
-  };
-
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
   gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
@@ -348,6 +344,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
   inherit (pkgs) gnome-video-effects; # added 2019-08-19
   inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
+  inherit (pkgs) glib-networking; # added 2019-09-02
 
   defaultIconTheme = adwaita-icon-theme;
   gtk = gtk3;