From 773d6c4ce73bce15ced79371f88c4fb5db960122 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 26 Apr 2025 12:45:04 +0000
Subject: [PATCH] xfce.xfce4-panel: 4.20.3 -> 4.20.4

https://gitlab.xfce.org/xfce/xfce4-panel/-/compare/xfce4-panel-4.20.3...xfce4-panel-4.20.4
---
 .../xfce/core/xfce4-panel/default.nix         | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index b863995947ba..f820f4a55bd3 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -2,6 +2,8 @@
   stdenv,
   lib,
   mkXfceDerivation,
+  fetchpatch,
+  python3,
   cairo,
   exo,
   garcon,
@@ -26,15 +28,28 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.20.3";
+  version = "4.20.4";
 
-  sha256 = "sha256-tLWjU0M7tuE+qqDwaE1CtnOjDiPWno8Mf7hhxYxbvjo=";
+  sha256 = "sha256-P1EZefpGRZ0DQ5S4Okw9pyly23d+UdPp5xMj1wJc44c=";
 
-  nativeBuildInputs = lib.optionals withIntrospection [
-    gobject-introspection
-    vala # vala bindings require GObject introspection
+  patches = [
+    # Fixes panel not shown on external display after reconnecting
+    # https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/925
+    (fetchpatch {
+      url = "https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/e2451cacd950f4b7539efd1e5e36b067515dba9b.patch";
+      hash = "sha256-h2iPlghHJeHD9PJp6RJrRx4MBsaqXuNclAJW6CKHE4A=";
+    })
   ];
 
+  nativeBuildInputs =
+    [
+      python3
+    ]
+    ++ lib.optionals withIntrospection [
+      gobject-introspection
+      vala # vala bindings require GObject introspection
+    ];
+
   buildInputs = [
     cairo
     exo
@@ -55,6 +70,8 @@ mkXfceDerivation {
   ];
 
   postPatch = ''
+    patchShebangs xdt-gen-visibility
+
     substituteInPlace plugins/clock/clock.c \
        --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
   '';