movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 04:05:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #199761 from Myaats/fix-pystray

Browse source
This commit is contained in:
Sandro 2022-11-21 21:21:32 +01:00 • committed by GitHub
commit 02ebf46231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/video/jellyfin-mpv-shim/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonApplication , buildPythonApplication
, fetchPypi , fetchPypi
, gobject-introspection
, jellyfin-apiclient-python , jellyfin-apiclient-python
, jinja2 , jinja2
, mpv , mpv
@ -9,6 +10,7 @@
, python-mpv-jsonipc , python-mpv-jsonipc
, pywebview , pywebview
, tkinter , tkinter
, wrapGAppsHook
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -20,6 +22,11 @@ buildPythonApplication rec {
sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";
}; };
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection
];
propagatedBuildInputs = [ propagatedBuildInputs = [
jellyfin-apiclient-python jellyfin-apiclient-python
mpv mpv
@ -52,6 +59,12 @@ buildPythonApplication rec {
--replace "notify_updates: bool = True" "notify_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 # no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "jellyfin_mpv_shim" ]; pythonImportsCheck = [ "jellyfin_mpv_shim" ];

14
pkgs/applications/video/plex-mpv-shim/default.nix
View file

@ -1,4 +1,5 @@
{ 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 { buildPythonApplication rec {
pname = "plex-mpv-shim"; pname = "plex-mpv-shim";
@ -11,8 +12,19 @@ buildPythonApplication rec {
sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r"; sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r";
}; };
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection
];
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc pystray tkinter ]; 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 # does not contain tests
doCheck = false; doCheck = false;

18
pkgs/development/python-modules/pystray/default.nix
View file

@ -1,5 +1,15 @@
{ lib, buildPythonPackage, fetchFromGitHub { lib
, pillow, xlib, six, xvfb-run, sphinx }: , buildPythonPackage
, fetchFromGitHub
, pillow
, xlib
, six
, xvfb-run
, sphinx
, gobject-introspection
, pygobject3
, gtk3
, libayatana-appindicator }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pystray"; pname = "pystray";
@ -12,8 +22,8 @@ buildPythonPackage rec {
sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs=";
}; };
nativeBuildInputs = [ sphinx ]; nativeBuildInputs = [ gobject-introspection sphinx ];
propagatedBuildInputs = [ pillow xlib six ]; propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ];
checkInputs = [ xvfb-run ]; checkInputs = [ xvfb-run ];
checkPhase = '' checkPhase = ''