ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

Override glib_networking with gnome 3.12 scope

Browse Source
This commit is contained in:
Luca Bruno 2014-05-21 11:01:14 +02:00 committed by Luca Bruno
parent e49509a4b1
commit 6e13cc82df
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -101,11 +101,11 @@ in {
}; };
environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
"${pkgs.glib_networking}/lib/gio/modules" ]; "${gnome3.glib_networking}/lib/gio/modules" ];
environment.systemPackages = environment.systemPackages =
[ pkgs.desktop_file_utils [ pkgs.desktop_file_utils
pkgs.glib_networking gnome3.glib_networking
pkgs.gtk3 # for gtk-update-icon-cache gnome3.gtk3 # for gtk-update-icon-cache
pkgs.ibus pkgs.ibus
pkgs.shared_mime_info # for update-mime-database pkgs.shared_mime_info # for update-mime-database
gnome3.dconf gnome3.dconf

26
pkgs/desktops/gnome-3/3.12/default.nix
View File

@ -44,6 +44,10 @@ rec {
gjs = callPackage ./core/gjs { }; gjs = callPackage ./core/gjs { };
glib_networking = pkgs.glib_networking.override {
inherit gsettings_desktop_schemas;
};
gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
gnome-contacts = callPackage ./core/gnome-contacts { }; gnome-contacts = callPackage ./core/gnome-contacts { };
@ -134,15 +138,27 @@ rec {
nautilus = callPackage ./core/nautilus { }; 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 { }; rest = callPackage ./core/rest { };