Commit a110f292 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

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

parent c2f1fa83

nixos/modules/services/x11/desktop-managers/gnome.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

nixos/modules/services/x11/display-managers/gdm.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

          ];

pkgs/applications/window-managers/phosh/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/desktops/gnome/core/gnome-control-center/default.nix→pkgs/by-name/gn/gnome-control-center/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnome-control-center";

      attrPath = "gnome.gnome-control-center";

    };

  };