From e44e0f63a9d3e8c082bba5b15ec900ab57b40bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 27 Feb 2021 17:34:49 -0300 Subject: [PATCH] xfce.xfce4-dockbarx-plugin: 0.5-a2dcb66 -> 0.6-5213876 - Change to fork repository, which is currently mainted - Update to version 0.6 revision 5213876 - Update to python3 - Update to vala_0_48 --- .../xfce4-dockbarx-plugin/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 e64d6fbae51..2c83abe6575 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -1,30 +1,30 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, bash, vala_0_48 , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { pname = "xfce4-dockbarx-plugin"; version = "${ver}-${rev}"; - ver = "0.5"; - rev = "a2dcb66"; + ver = "0.6"; + rev = "5213876"; src = fetchFromGitHub { - owner = "TiZ-EX1"; + owner = "xuzhen"; repo = "xfce4-dockbarx-plugin"; rev = rev; - sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx"; + sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn"; }; pythonPath = [ dockbarx ]; nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] + buildInputs = [ python3 vala_0_48 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ 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 python2' ${bash}/bin/bash + substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python3' ${bash}/bin/bash ''; postFixup = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"; + homepage = "https://github.com/xuzhen/xfce4-dockbarx-plugin"; description = "A plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; platforms = platforms.linux;