Merge pull request #199761 from Myaats/fix-pystray

Sandro 02ebf462 aaa31647

Changed files
+40 -5
pkgs
applications
video
jellyfin-mpv-shim
plex-mpv-shim
development
python-modules
pystray
+13
pkgs/applications/video/jellyfin-mpv-shim/default.nix
···
{ lib
, buildPythonApplication
, fetchPypi
+
, gobject-introspection
, jellyfin-apiclient-python
, jinja2
, mpv
···
, python-mpv-jsonipc
, pywebview
, tkinter
+
, wrapGAppsHook
}:
buildPythonApplication rec {
···
inherit pname version;
sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";
};
+
+
nativeBuildInputs = [
+
wrapGAppsHook
+
gobject-introspection
+
];
propagatedBuildInputs = [
jellyfin-apiclient-python
···
--replace "check_updates: bool = True" "check_updates: bool = False" \
--replace "notify_updates: bool = True" "notify_updates: bool = False"
'';
+
+
# needed for pystray to access appindicator using GI
+
preFixup = ''
+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+
'';
+
dontWrapGApps = true;
# no tests
doCheck = false;
+13 -1
pkgs/applications/video/plex-mpv-shim/default.nix
···
-
{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter }:
+
{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter
+
, wrapGAppsHook, gobject-introspection }:
buildPythonApplication rec {
pname = "plex-mpv-shim";
···
sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r";
};
+
nativeBuildInputs = [
+
wrapGAppsHook
+
gobject-introspection
+
];
+
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc pystray tkinter ];
+
+
# needed for pystray to access appindicator using GI
+
preFixup = ''
+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+
'';
+
dontWrapGApps = true;
# does not contain tests
doCheck = false;
+14 -4
pkgs/development/python-modules/pystray/default.nix
···
-
{ lib, buildPythonPackage, fetchFromGitHub
-
, pillow, xlib, six, xvfb-run, sphinx }:
+
{ lib
+
, buildPythonPackage
+
, fetchFromGitHub
+
, pillow
+
, xlib
+
, six
+
, xvfb-run
+
, sphinx
+
, gobject-introspection
+
, pygobject3
+
, gtk3
+
, libayatana-appindicator }:
buildPythonPackage rec {
pname = "pystray";
···
sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs=";
};
-
nativeBuildInputs = [ sphinx ];
-
propagatedBuildInputs = [ pillow xlib six ];
+
nativeBuildInputs = [ gobject-introspection sphinx ];
+
propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ];
checkInputs = [ xvfb-run ];
checkPhase = ''