From d1fa4b2cc722a2cd1fd3e1b391cf9fa11b717cc6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:27:19 +0800
Subject: [PATCH] libxfce4ui: Move to top-level

---
 nixos/modules/services/x11/desktop-managers/xfce.nix          | 2 +-
 .../default.nix => by-name/li/libxfce4ui/package.nix}         | 0
 pkgs/by-name/pr/pragha/package.nix                            | 4 ++--
 pkgs/desktops/xfce/default.nix                                | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/xfce/core/libxfce4ui/default.nix => by-name/li/libxfce4ui/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 74c481dd5b8c..04f4f78de45e 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -131,7 +131,7 @@ in
 
         xfce.exo
         xfce.garcon
-        xfce.libxfce4ui
+        libxfce4ui
 
         xfce.mousepad
         xfce.parole
diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/by-name/li/libxfce4ui/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/libxfce4ui/default.nix
rename to pkgs/by-name/li/libxfce4ui/package.nix
diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix
index 5e92f657a67f..8afac719c45b 100644
--- a/pkgs/by-name/pr/pragha/package.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -34,7 +34,7 @@
   withGudev ? false, # experimental
   libmtp,
   withMtp ? false, # experimental
-  xfce,
+  libxfce4ui,
   xfce4-dev-tools,
   withXfce4ui ? false,
   totem-pl-parser,
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withGlyr glyr
     ++ lib.optional withLibsoup libsoup_2_4
     ++ lib.optional withMtp libmtp
-    ++ lib.optional withXfce4ui xfce.libxfce4ui
+    ++ lib.optional withXfce4ui libxfce4ui
     ++ lib.optional withTotemPlParser totem-pl-parser
   # ++ lib.optional withGrilo grilo
   # ++ lib.optional withRygel rygel
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 1809881e2284..767340586773 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -21,8 +21,6 @@ makeScopeWithSplicing' {
 
       garcon = callPackage ./core/garcon { };
 
-      libxfce4ui = callPackage ./core/libxfce4ui { };
-
       libxfce4windowing = callPackage ./core/libxfce4windowing { };
 
       thunar-unwrapped = callPackage ./core/thunar { };
@@ -172,6 +170,7 @@ makeScopeWithSplicing' {
 }
 // lib.optionalAttrs config.allowAliases {
   # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
+  libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23
   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
   xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23