From fd8890765ae77e300cd530c587ac66d8b6d95b73 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 19 Dec 2025 16:45:45 -0800
Subject: [PATCH] xfce4-dock{barx,like}-plugin: move to top-level;
 xfce-dockbarx-plugin: fix build

---
 .../xf/xfce4-dockbarx-plugin/package.nix}                  | 2 ++
 .../xf/xfce4-docklike-plugin/package.nix}                  | 0
 pkgs/desktops/xfce/default.nix                             | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename pkgs/{desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix => by-name/xf/xfce4-dockbarx-plugin/package.nix} (95%)
 rename pkgs/{desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix => by-name/xf/xfce4-docklike-plugin/package.nix} (100%)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix
similarity index 95%
rename from pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
rename to pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix
index cdf9fad0adc6..5915158761a2 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ZxaWORqA8LiM4CzakxClg5C6AsyHrzCGydgboCrC45g=";
   };
 
+  cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ];
+
   pythonPath = [
     dockbarx
     python3Packages.pygobject3
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix b/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
rename to pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 7eb418fd78a0..e3a689fc72df 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -89,10 +89,6 @@ makeScopeWithSplicing' {
 
       #### PANEL PLUGINS
 
-      xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
-
-      xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { };
-
       xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
 
       xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
@@ -166,4 +162,7 @@ makeScopeWithSplicing' {
   xfce4-clipman-plugin = lib.warnOnInstantiate "‘xfce.xfce4-clipman-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-clipman-plugin’ directly" pkgs.xfce4-clipman-plugin; # Added on 2025-12-19
   xfce4-cpufreq-plugin = lib.warnOnInstantiate "‘xfce.xfce4-cpufreq-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-cpufreq-plugin’ directly" pkgs.xfce4-cpufreq-plugin; # Added on 2025-12-19
   xfce4-cpugraph-plugin = lib.warnOnInstantiate "‘xfce.xfce4-cpugraph-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-cpugraph-plugin’ directly" pkgs.xfce4-cpugraph-plugin; # Added on 2025-12-19
+  xfce4-dockbarx-plugin = lib.warnOnInstantiate "‘xfce.xfce4-dockbarx-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-dockbarx-plugin’ directly" pkgs.xfce4-dockbarx-plugin; # Added on 2025-12-19
+  xfce4-docklike-plugin = lib.warnOnInstantiate "‘xfce.xfce4-docklike-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-docklike-plugin’ directly" pkgs.xfce4-docklike-plugin; # Added on 2025-12-19
+
 }