diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix index db4643e17746..ca8100c20bcf 100644 --- a/pkgs/by-name/jg/jgmenu/package.nix +++ b/pkgs/by-name/jg/jgmenu/package.nix @@ -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 ]; diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/by-name/li/libxfce4util/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/libxfce4util/default.nix rename to pkgs/by-name/li/libxfce4util/package.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f1d1fb001a37..0a5ae1737a76 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -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 } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c54fa90f5003..6048d076b74c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {