diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-05-29 03:22:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-29 03:22:51 +0200 |
commit | 3ac24a7eb5b0ed0d3d5c87744804e939c7b02c2f (patch) | |
tree | e16ae38d90a34f8e4263c31893c219b27728367e /pkgs/applications/misc | |
parent | aeb4b895b4c6be2218bf68d2e155e139ce956e8c (diff) | |
parent | e79342a712b375b1d0731fcf1acef9d2ab1ce069 (diff) |
Merge pull request #121433 from romildo/fix.dockbarx
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/dockbarx/default.nix | 95 |
1 files changed, 69 insertions, 26 deletions
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 5bc8de522decf..cac6c363c3237 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,41 +1,84 @@ -{ lib, fetchFromGitHub, python2Packages, gnome2, keybinder }: +{ lib +, fetchFromGitHub +, glib +, gobject-introspection +, gtk3 +, keybinder3 +, libwnck3 +, python3Packages +, wrapGAppsHook +}: -python2Packages.buildPythonApplication rec { - ver = "0.93"; - name = "dockbarx-${ver}"; +python3Packages.buildPythonApplication rec { + pname = "dockbarx"; + version = "${ver}-${rev}"; + ver = "1.0-beta"; + rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe"; src = fetchFromGitHub { - owner = "M7S"; + owner = "xuzhen"; repo = "dockbarx"; - rev = ver; - sha256 = "1h1g2vag5vnx87sa1f0qi8rq7wlr2ymvkrdr08kk7cma4wk0x6hg"; + rev = rev; + sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m"; }; - postPatch = '' - substituteInPlace setup.py --replace /usr/ "" - substituteInPlace setup.py --replace '"/", "usr", "share",' '"share",' - substituteInPlace dockbarx/applets.py --replace /usr/share/ $out/share/ - substituteInPlace dockbarx/dockbar.py --replace /usr/share/ $out/share/ - substituteInPlace dockbarx/iconfactory.py --replace /usr/share/ $out/share/ - substituteInPlace dockbarx/theme.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/battery_status.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/namebar.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/namebar_window_buttons.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/ - ''; + nativeBuildInputs = [ + glib.dev + python3Packages.polib + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libwnck3 + keybinder3 + ]; - propagatedBuildInputs = (with python2Packages; [ pygtk pyxdg dbus-python pillow xlib ]) - ++ (with gnome2; [ gnome_python gnome_python_desktop ]) - ++ [ keybinder ]; + propagatedBuildInputs = with python3Packages; [ + dbus-python + pillow + pygobject3 + pyxdg + xlib + ]; # no tests doCheck = false; + dontWrapGApps = true; + + postPatch = '' + substituteInPlace setup.py \ + --replace /usr/ "" \ + --replace '"/", "usr", "share",' '"share",' + + for f in \ + dbx_preference \ + dockbarx/applets.py \ + dockbarx/dockbar.py \ + dockbarx/iconfactory.py \ + dockbarx/theme.py \ + mate_panel_applet/dockbarx_mate_applet + do + substituteInPlace $f --replace /usr/share/ $out/share/ + done + ''; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { - homepage = "https://launchpad.net/dockbar/"; - description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; - license = licenses.gpl3; + homepage = "https://github.com/xuzhen/dockbarx"; + description = "Lightweight taskbar/panel replacement which works as a stand-alone dock"; + license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.volth ]; + maintainers = [ maintainers.romildo ]; }; } |