xfce4-panel: Move to top-level

This commit is contained in:
Bobby Rong
2025-12-23 22:54:22 +08:00
parent aaf60f73c3
commit db7a3606d4
6 changed files with 7 additions and 10 deletions
@@ -160,7 +160,7 @@ in
xfce.xfwm4-themes
]
++ lib.optionals (!cfg.noDesktop) [
xfce.xfce4-panel
xfce4-panel
xfce.xfdesktop
]
++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver
+2 -2
View File
@@ -12,7 +12,7 @@
xorg,
makeWrapper,
enableXfcePanelApplet ? false,
xfce,
xfce4-panel,
gtk3,
gitUpdater,
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableXfcePanelApplet [
gtk3
libxfce4util
xfce.xfce4-panel
xfce4-panel
];
configureFlags = [
+1 -2
View File
@@ -33,8 +33,6 @@ makeScopeWithSplicing' {
tumbler = callPackage ./core/tumbler { };
xfce4-panel = callPackage ./core/xfce4-panel { };
xfce4-session = callPackage ./core/xfce4-session { };
xfce4-settings = callPackage ./core/xfce4-settings { };
@@ -170,5 +168,6 @@ makeScopeWithSplicing' {
libxfce4util = lib.warnOnInstantiate "xfce.libxfce4util was moved to top-level. Please use pkgs.libxfce4util directly" pkgs.libxfce4util; # Added on 2025-12-23
libxfce4windowing = lib.warnOnInstantiate "xfce.libxfce4windowing was moved to top-level. Please use pkgs.libxfce4windowing directly" pkgs.libxfce4windowing; # Added on 2025-12-23
xfce4-dev-tools = lib.warnOnInstantiate "xfce.xfce4-dev-tools was moved to top-level. Please use pkgs.xfce4-dev-tools directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
xfce4-panel = lib.warnOnInstantiate "xfce.xfce4-panel was moved to top-level. Please use pkgs.xfce4-panel directly" pkgs.xfce4-panel; # Added on 2025-12-23
xfconf = lib.warnOnInstantiate "xfce.xfconf was moved to top-level. Please use pkgs.xfconf directly" pkgs.xfconf; # Added on 2025-12-23
}
@@ -10,7 +10,7 @@
pkg-config,
python3Packages,
wrapGAppsHook3,
xfce,
xfce4-panel,
xfconf,
}:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [
keybinder3
python3Packages.python
xfce.xfce4-panel
xfce4-panel
xfconf
]
++ pythonPath;
+1 -3
View File
@@ -12466,9 +12466,7 @@ with pkgs;
inherit (haskellPackages) ghcWithPackages;
};
xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
inherit (xfce) xfce4-panel;
};
xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { };
xmonad_log_applet_mate = xmonad_log_applet.override {
desktopSupport = "mate";