ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

gnome3.glib-networking: replace with alias

Browse Source 
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.
This commit is contained in:
Jan Tojnar 2019-09-02 13:53:11 +02:00
parent 6fabbe513b
commit fa03881954
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/desktops/gnome3/glib-networking.nix
View File

@ -22,11 +22,11 @@ with lib;
config = mkIf config.services.gnome3.glib-networking.enable { 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" ];
}; };

5
pkgs/desktops/gnome-3/default.nix
View File

@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gjs = callPackage ./core/gjs { }; gjs = callPackage ./core/gjs { };
glib-networking = pkgs.glib-networking.override {
inherit (pkgs) gsettings-desktop-schemas;
};
gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; 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) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19 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) 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; defaultIconTheme = adwaita-icon-theme;
gtk = gtk3; gtk = gtk3;

3
pkgs/development/libraries/gvfs/default.nix
View File

@ -25,6 +25,7 @@
, gnomeSupport ? false , gnomeSupport ? false
, gnome3 , gnome3
, gcr , gcr
, glib-networking
, gnome-online-accounts , gnome-online-accounts
, wrapGAppsHook , wrapGAppsHook
, libimobiledevice , libimobiledevice
@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals gnomeSupport [ ] ++ stdenv.lib.optionals gnomeSupport [
gnome3.libsoup gnome3.libsoup
gcr gcr
gnome3.glib-networking # TLS support glib-networking # TLS support
gnome-online-accounts gnome-online-accounts
libsecret libsecret
libgdata libgdata