xfce.xfce4-panel: 4.18.6 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-panel/-/compare/xfce4-panel-4.18.6...xfce4-panel-4.20.0

pkgs/desktops/xfce/core/xfce4-panel/default.nix

@@ -1,24 +1,28 @@
 { lib
 , mkXfceDerivation
+, cairo
 , exo
 , garcon
 , gobject-introspection
+, gtk-layer-shell
 , gtk3
 , libdbusmenu-gtk3
 , libwnck
 , libxfce4ui
 , libxfce4util
+, libxfce4windowing
 , tzdata
 , vala
+, wayland
 , xfconf
 }:
 
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.18.6";
+  version = "4.20.0";
 
-  sha256 = "sha256-eQLz/LJIx2WkzcSLytRdJdhtGv0woT48mdqG7eHB0U4=";
+  sha256 = "sha256-oB7mlU7RZtRuCQAKgv5I7ZRRu703Za7Ki9+AkHSELRE=";
 
   nativeBuildInputs = [
     gobject-introspection
@@ -26,13 +30,17 @@ mkXfceDerivation {
   ];
 
   buildInputs = [
+    cairo
     exo
     garcon
+    gtk-layer-shell
     libdbusmenu-gtk3
     libxfce4ui
+    libxfce4windowing
     libwnck
-    xfconf
     tzdata
+    wayland
+    xfconf
   ];
 
   propagatedBuildInputs = [
@@ -40,8 +48,6 @@ mkXfceDerivation {
     libxfce4util
   ];
 
-  patches = [ ./xfce4-panel-datadir.patch ];
-
   postPatch = ''
     substituteInPlace plugins/clock/clock.c \
        --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"

pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch

@@ -1,24 +0,0 @@
-diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c
-index 529fe85..8c792b7 100644
---- a/panel/panel-module-factory.c
-+++ b/panel/panel-module-factory.c
-@@ -39,6 +39,7 @@
- #include <panel/panel-module.h>
- #include <panel/panel-module-factory.h>
- 
-+#define DATADIR "/run/current-system/sw/share/xfce4"
- #define PANEL_PLUGINS_DATA_DIR     (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
- #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins")
- 
-diff --git a/panel/panel-module.c b/panel/panel-module.c
-index ba39320..519440b 100644
---- a/panel/panel-module.c
-+++ b/panel/panel-module.c
-@@ -35,6 +35,7 @@
- #include <panel/panel-plugin-external-wrapper.h>
- #include <panel/panel-plugin-external-46.h>
- 
-+#define LIBDIR "/run/current-system/sw/lib/xfce4"
- #define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
- #define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
-