From 417179abbdfec986f31b712d64988818bc91176e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 18:50:03 -0400 Subject: [PATCH] budgie-desktop{,with-plugins}: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 6 +++--- nixos/tests/budgie.nix | 2 +- pkgs/by-name/bu/budgie-control-center/package.nix | 6 +++--- .../bu/budgie-desktop-with-plugins/package.nix} | 0 .../default.nix => by-name/bu/budgie-desktop/package.nix} | 7 +++---- .../budgie => by-name/bu}/budgie-desktop/plugins.patch | 0 pkgs/desktops/budgie/default.nix | 2 -- .../plugins/budgie-analogue-clock-applet/default.nix | 4 ++-- .../budgie/plugins/budgie-user-indicator-redux/default.nix | 4 ++-- 9 files changed, 14 insertions(+), 17 deletions(-) rename pkgs/{desktops/budgie/budgie-desktop/wrapper.nix => by-name/bu/budgie-desktop-with-plugins/package.nix} (100%) rename pkgs/{desktops/budgie/budgie-desktop/default.nix => by-name/bu/budgie-desktop/package.nix} (96%) rename pkgs/{desktops/budgie => by-name/bu}/budgie-desktop/plugins.patch (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index c4fcf1612846..777ae096fc81 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -94,7 +94,7 @@ in { config = mkIf cfg.enable { services.displayManager.sessionPackages = with pkgs; [ - budgie.budgie-desktop + budgie-desktop ]; services.xserver.displayManager.lightdm.greeters.slick = { @@ -123,7 +123,7 @@ in { # Budgie Desktop. budgie-backgrounds budgie-control-center' - (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) + (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view budgie.budgie-screensaver budgie.budgie-session @@ -210,7 +210,7 @@ in { xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk # provides a XDG Portals implementation. ]; - xdg.portal.configPackages = mkDefault [ pkgs.budgie.budgie-desktop ]; + xdg.portal.configPackages = mkDefault [ pkgs.budgie-desktop ]; services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel. services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel. diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index 203e718c8c6d..f9d873af95e3 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -63,7 +63,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ" machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'") - machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie.budgie-desktop-with-plugins.pname}'") + machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'") with subtest("Open run dialog"): machine.send_key("alt-f2") diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 10d29b162731..65feaa196b9b 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -5,7 +5,7 @@ substituteAll, accountsservice, adwaita-icon-theme, - budgie, + budgie-desktop, cheese, clutter, clutter-gtk, @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (substituteAll { src = ./paths.patch; - budgie_desktop = budgie.budgie-desktop; + budgie_desktop = budgie-desktop; gcm = gnome.gnome-color-manager; inherit cups @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( # Sound theme - --prefix XDG_DATA_DIRS : "${budgie.budgie-desktop}/share" + --prefix XDG_DATA_DIRS : "${budgie-desktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-desktop/wrapper.nix rename to pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/by-name/bu/budgie-desktop/package.nix similarity index 96% rename from pkgs/desktops/budgie/budgie-desktop/default.nix rename to pkgs/by-name/bu/budgie-desktop/package.nix index 4687c52e4f9b..34253793db2c 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, accountsservice, alsa-lib, - budgie-screensaver, + budgie, docbook-xsl-nons, glib, gnome, @@ -23,7 +23,6 @@ libpulseaudio, libuuid, libwnck, - magpie, mesa, meson, ninja, @@ -65,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice alsa-lib - budgie-screensaver + budgie.budgie-screensaver glib gnome-desktop gnome.gnome-settings-daemon @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libuuid libwnck - magpie + budgie.magpie mesa polkit sassc diff --git a/pkgs/desktops/budgie/budgie-desktop/plugins.patch b/pkgs/by-name/bu/budgie-desktop/plugins.patch similarity index 100% rename from pkgs/desktops/budgie/budgie-desktop/plugins.patch rename to pkgs/by-name/bu/budgie-desktop/plugins.patch diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 09f4564bec5d..033db368e653 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,9 +6,7 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-desktop = callPackage ./budgie-desktop { }; budgie-desktop-view = callPackage ./budgie-desktop-view { }; - budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { }; budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { }; diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 501a009700ee..873ee28d4e86 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -6,7 +6,7 @@ ninja, pkg-config, vala, - budgie, + budgie-desktop, gtk3, libpeas, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - budgie.budgie-desktop + budgie-desktop gtk3 libpeas ]; diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 5839f511e9b6..ddd0f45a34b5 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, accountsservice, - budgie, + budgie-desktop, gtk3, intltool, libgee, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice - budgie.budgie-desktop + budgie-desktop gtk3 libgee libpeas