Merge pull request #227372 from bobby285271/fix/dockbarx

dockbarx: 1.0-beta -> 1.0-beta2, xfce4-dockbarx-plugin: 0.6 -> 0.7.2

pkgs/applications/misc/dockbarx/default.nix

@@ -11,25 +11,23 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dockbarx";
-  version = "${ver}-${rev}";
-  ver = "1.0-beta";
-  rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe";
+  version = "1.0-beta2";
 
   src = fetchFromGitHub {
     owner = "xuzhen";
     repo = "dockbarx";
-    rev = rev;
-    sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m";
+    rev = version;
+    sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI=";
   };
 
   nativeBuildInputs = [
     glib.dev
+    gobject-introspection
     python3Packages.polib
     wrapGAppsHook
   ];
 
   buildInputs = [
-    gobject-introspection
     gtk3
     libwnck
     keybinder3

pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix

@@ -2,28 +2,25 @@
 , stdenv
 , fetchFromGitHub
 , bash
+, cmake
 , dockbarx
 , gobject-introspection
 , keybinder3
 , pkg-config
 , python3Packages
-, vala
-, wafHook
 , wrapGAppsHook
 , xfce
 }:
 
 stdenv.mkDerivation rec {
   pname = "xfce4-dockbarx-plugin";
-  version = "${ver}-${rev}";
-  ver = "0.6";
-  rev = "5213876151f1836f044e9902a22d1e682144c1e0";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "xuzhen";
     repo = "xfce4-dockbarx-plugin";
-    rev = rev;
-    sha256 = "sha256-VqtGcBRjvpCO9prVHOv6Gt1rAZtcAgkQkVCoR6ykC2k=";
+    rev = "v${version}";
+    sha256 = "sha256-ZxaWORqA8LiM4CzakxClg5C6AsyHrzCGydgboCrC45g=";
   };
 
   pythonPath = [
@@ -32,11 +29,10 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    cmake
     gobject-introspection
     pkg-config
     python3Packages.wrapPython
-    vala
-    wafHook
     wrapGAppsHook
   ];
 
@@ -49,14 +45,20 @@ stdenv.mkDerivation rec {
   ++ pythonPath;
 
   postPatch = ''
-    substituteInPlace wscript           --replace /usr/share/            "\''${PREFIX}/share/"
-    substituteInPlace src/dockbarx.vala --replace /usr/share/            $out/share/
-    substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python3' ${bash}/bin/bash
+    # We execute the wrapped xfce4-panel-plug directly.
+    # Since argv is used for g_free() we also need to shift the indexes.
+    substituteInPlace src/xfce_panel_plugin.c \
+      --replace '"python3",' "" \
+      --replace "g_free(argv[3]);" "g_free(argv[2]);" \
+      --replace "g_free(argv[5]);" "g_free(argv[4]);"
+
+    patchShebangs src/xfce4-dockbarx-plug.py
   '';
 
   postFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-    wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
+    chmod +x $out/share/dockbarx/xfce4-panel-plug
+    wrapPythonProgramsIn "$out/share/dockbarx" "$out $pythonPath"
   '';
 
   meta = with lib; {