From e79342a712b375b1d0731fcf1acef9d2ab1ce069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 1 May 2021 17:24:35 -0300
Subject: [PATCH] xfce.xfce4-dockbarx-plugin: fix dependences and wrapping

Also replace maintainer.
---
 .../xfce4-dockbarx-plugin/default.nix         | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index 2c83abe6575e..9224a22e53ba 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -1,11 +1,23 @@
-{ lib, stdenv, pkg-config, fetchFromGitHub, python3, bash, vala_0_48
-, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, bash
+, dockbarx
+, gobject-introspection
+, keybinder3
+, pkg-config
+, python3Packages
+, vala_0_48
+, wafHook
+, wrapGAppsHook
+, xfce
+}:
 
 stdenv.mkDerivation rec {
   pname = "xfce4-dockbarx-plugin";
   version = "${ver}-${rev}";
   ver = "0.6";
-  rev = "5213876";
+  rev = "5213876151f1836f044e9902a22d1e682144c1e0";
 
   src = fetchFromGitHub {
     owner = "xuzhen";
@@ -14,12 +26,27 @@ stdenv.mkDerivation rec {
     sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn";
   };
 
-  pythonPath = [ dockbarx ];
+  pythonPath = [
+    dockbarx
+    python3Packages.pygobject3
+  ];
 
-  nativeBuildInputs = [ pkg-config wafHook ];
-  buildInputs = [ python3 vala_0_48 gtk2 pythonPackages.wrapPython ]
-    ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
-    ++ pythonPath;
+  nativeBuildInputs = [
+    gobject-introspection
+    pkg-config
+    python3Packages.wrapPython
+    vala_0_48
+    wafHook
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    keybinder3
+    python3Packages.python
+    xfce.xfce4-panel
+    xfce.xfconf
+  ]
+  ++ pythonPath;
 
   postPatch = ''
     substituteInPlace wscript           --replace /usr/share/            "\''${PREFIX}/share/"
@@ -28,14 +55,15 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
     wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
   '';
 
   meta = with lib; {
     homepage = "https://github.com/xuzhen/xfce4-dockbarx-plugin";
-    description = "A plugins to embed DockbarX into xfce4-panel";
+    description = "Plugins to embed DockbarX into xfce4-panel";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = [ maintainers.volth ];
+    maintainers = [ maintainers.romildo ];
   };
 }