From fa03881954a0957522785dc5c52f45d07cdae87d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 13:53:11 +0200 Subject: [PATCH] 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. --- nixos/modules/services/desktops/gnome3/glib-networking.nix | 6 +++--- pkgs/desktops/gnome-3/default.nix | 5 +---- pkgs/development/libraries/gvfs/default.nix | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix index 186668d7d385..fcd58509d6fc 100644 --- a/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -22,11 +22,11 @@ with lib; config = mkIf config.services.gnome3.glib-networking.enable { - services.dbus.packages = [ pkgs.gnome3.glib-networking ]; + services.dbus.packages = [ pkgs.glib-networking ]; - systemd.packages = [ pkgs.gnome3.glib-networking ]; + systemd.packages = [ pkgs.glib-networking ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ]; + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; }; 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; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f622448b185d..8b3bc30a6616 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -25,6 +25,7 @@ , gnomeSupport ? false , gnome3 , gcr +, glib-networking , gnome-online-accounts , wrapGAppsHook , libimobiledevice @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals gnomeSupport [ gnome3.libsoup gcr - gnome3.glib-networking # TLS support + glib-networking # TLS support gnome-online-accounts libsecret libgdata