gnome-control-center: Move from gnome scope to top-level

This commit is contained in:
Jan Tojnar 2024-08-28 23:56:06 +02:00
parent c2f1fa833e
commit a110f292a1
6 changed files with 6 additions and 8 deletions

View File

@ -371,13 +371,13 @@ in
mandatoryPackages = [
pkgs.gnome-shell
];
optionalPackages = with pkgs.gnome; [
optionalPackages = [
pkgs.adwaita-icon-theme
nixos-background-info
pkgs.gnome-backgrounds
pkgs.gnome-bluetooth
pkgs.gnome-color-manager
gnome-control-center
pkgs.gnome-control-center
pkgs.gnome-shell-extensions
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gnome-user-docs

View File

@ -153,7 +153,7 @@ in
XDG_DATA_DIRS = lib.makeSearchPath "share" [
gdm # for gnome-login.session
config.services.displayManager.sessionData.desktops
pkgs.gnome.gnome-control-center # for accessibility icon
pkgs.gnome-control-center # for accessibility icon
pkgs.adwaita-icon-theme
pkgs.hicolor-icon-theme # empty icon theme as a base
];

View File

@ -17,8 +17,8 @@
, evince
, glib
, gtk4
, gnome
, gnome-bluetooth
, gnome-control-center
, gnome-desktop
, gnome-session
, gnome-shell
@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
polkit
gmobile
gnome-bluetooth
gnome.gnome-control-center
gnome-control-center
gnome-desktop
gnome-session
gtk4

View File

@ -207,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-control-center";
attrPath = "gnome.gnome-control-center";
};
};

View File

@ -17,8 +17,6 @@ in
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
gnome-control-center = callPackage ./core/gnome-control-center { };
gvfs = pkgs.gvfs.override { gnomeSupport = true; };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
@ -100,6 +98,7 @@ in
gnome-calculator = lib.warn "The gnome.gnome-calculator was moved to top-level. Please use pkgs.gnome-calculator directly." pkgs.gnome-calculator; # Added on 2024-06-22.
gnome-calendar = lib.warn "The gnome.gnome-calendar was moved to top-level. Please use pkgs.gnome-calendar directly." pkgs.gnome-calendar; # Added on 2024-06-22.
gnome-contacts = lib.warn "The gnome.gnome-contacts was moved to top-level. Please use pkgs.gnome-contacts directly." pkgs.gnome-contacts; # Added on 2024-08-11.
gnome-control-center = lib.warn "The gnome.gnome-control-center was moved to top-level. Please use pkgs.gnome-control-center directly." pkgs.gnome-control-center; # Added on 2024-08-28.
gnome-dictionary = lib.warn "The gnome.gnome-dictionary was moved to top-level. Please use pkgs.gnome-dictionary directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
gnome-disk-utility = lib.warn "The gnome.gnome-disk-utility was moved to top-level. Please use pkgs.gnome-disk-utility directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
gnome-font-viewer = lib.warn "The gnome.gnome-font-viewer was moved to top-level. Please use pkgs.gnome-font-viewer directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.