budgie-control-center: move from budgie scope to top-level

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

@@ -40,7 +40,7 @@ let
     destination = "/share/gnome-background-properties/nixos.xml";
   };
 
-  budgie-control-center = pkgs.budgie.budgie-control-center.override {
+  budgie-control-center' = pkgs.budgie-control-center.override {
     enableSshSocket = config.services.openssh.startWhenNeeded;
   };
 
@@ -122,7 +122,7 @@ in {
       [
         # Budgie Desktop.
         budgie-backgrounds
-        budgie-control-center
+        budgie-control-center'
         (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
         budgie.budgie-desktop-view
         budgie.budgie-screensaver
@@ -243,7 +243,7 @@ in {
 
     # Register packages for DBus.
     services.dbus.packages = [
-      budgie-control-center
+      budgie-control-center'
     ];
 
     # Register packages for udev.

pkgs/by-name/bu/budgie-control-center/package.nix

@@ -5,7 +5,7 @@
   substituteAll,
   accountsservice,
   adwaita-icon-theme,
-  budgie-desktop,
+  budgie,
   cheese,
   clutter,
   clutter-gtk,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     (substituteAll {
       src = ./paths.patch;
-      budgie_desktop = budgie-desktop;
+      budgie_desktop = budgie.budgie-desktop;
       gcm = gnome.gnome-color-manager;
       inherit
         cups
@@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       # Sound theme
-      --prefix XDG_DATA_DIRS : "${budgie-desktop}/share"
+      --prefix XDG_DATA_DIRS : "${budgie.budgie-desktop}/share"
       # Thumbnailers (for setting user profile pictures)
       --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"

pkgs/desktops/budgie/default.nix

@@ -6,7 +6,6 @@ lib.makeScope newScope (
     inherit (self) callPackage;
   in
   {
-    budgie-control-center = callPackage ./budgie-control-center { };
     budgie-desktop = callPackage ./budgie-desktop { };
     budgie-desktop-view = callPackage ./budgie-desktop-view { };
     budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };