libxfce4util: Move to top-level
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
python3Packages,
|
||||
pango,
|
||||
librsvg,
|
||||
libxfce4util,
|
||||
libxml2,
|
||||
menu-cache,
|
||||
xorg,
|
||||
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals enableXfcePanelApplet [
|
||||
gtk3
|
||||
xfce.libxfce4util
|
||||
libxfce4util
|
||||
xfce.xfce4-panel
|
||||
];
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@ makeScopeWithSplicing' {
|
||||
|
||||
libxfce4ui = callPackage ./core/libxfce4ui { };
|
||||
|
||||
libxfce4util = callPackage ./core/libxfce4util { };
|
||||
|
||||
libxfce4windowing = callPackage ./core/libxfce4windowing { };
|
||||
|
||||
thunar-unwrapped = callPackage ./core/thunar { };
|
||||
@@ -176,5 +174,6 @@ makeScopeWithSplicing' {
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
# These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
|
||||
libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # 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
|
||||
}
|
||||
|
||||
@@ -12467,7 +12467,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
|
||||
inherit (xfce) libxfce4util xfce4-panel;
|
||||
inherit (xfce) xfce4-panel;
|
||||
};
|
||||
|
||||
xmonad_log_applet_mate = xmonad_log_applet.override {
|
||||
|
||||
Reference in New Issue
Block a user