diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/applications/misc/dockbarx | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/dockbarx')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/dockbarx/default.nix | 95 |
1 files changed, 69 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/applications/misc/dockbarx/default.nix b/nixpkgs/pkgs/applications/misc/dockbarx/default.nix index 5bc8de522dec..cac6c363c323 100644 --- a/nixpkgs/pkgs/applications/misc/dockbarx/default.nix +++ b/nixpkgs/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 ]; }; } |