From 50124d6c9f3cc0c6d55e6ca0cf4f0dfdc1513ace Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:16:27 -0400 Subject: [PATCH] budgie-session: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- .../budgie => by-name/bu}/budgie-session/fix-paths.patch | 0 .../default.nix => by-name/bu/budgie-session/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/budgie => by-name/bu}/budgie-session/fix-paths.patch (100%) rename pkgs/{desktops/budgie/budgie-session/default.nix => by-name/bu/budgie-session/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index a711c3ff1c57..3748ad036c96 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -126,7 +126,7 @@ in { (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie-desktop-view budgie-screensaver - budgie.budgie-session + budgie-session # Required by Budgie Menu. gnome-menus diff --git a/pkgs/desktops/budgie/budgie-session/fix-paths.patch b/pkgs/by-name/bu/budgie-session/fix-paths.patch similarity index 100% rename from pkgs/desktops/budgie/budgie-session/fix-paths.patch rename to pkgs/by-name/bu/budgie-session/fix-paths.patch diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/by-name/bu/budgie-session/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-session/default.nix rename to pkgs/by-name/bu/budgie-session/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index d5a68d4e978e..82e0f2cceddf 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-session = callPackage ./budgie-session { }; magpie = callPackage ./magpie { }; } )