Unverified Commit 02ebf462 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #199761 from Myaats/fix-pystray

parents aaa31647 b70b4d0d

pkgs/applications/video/jellyfin-mpv-shim/default.nix

+13 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonApplication

, fetchPypi

, gobject-introspection

, jellyfin-apiclient-python

, jinja2

, mpv
@@ -9,6 +10,7 @@ 
, python-mpv-jsonipc

, pywebview

, tkinter

, wrapGAppsHook

}:



buildPythonApplication rec {
@@ -20,6 +22,11 @@ buildPythonApplication rec { 
    sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";

  };



  nativeBuildInputs = [

    wrapGAppsHook

    gobject-introspection

  ];



  propagatedBuildInputs = [

    jellyfin-apiclient-python

    mpv
@@ -52,6 +59,12 @@ buildPythonApplication rec { 
      --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;

  pythonImportsCheck = [ "jellyfin_mpv_shim" ];

pkgs/applications/video/plex-mpv-shim/default.nix

+13 −1
Original line number Diff line number Diff line 
{ 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";
@@ -11,8 +12,19 @@ buildPythonApplication rec { 
    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;

pkgs/development/python-modules/pystray/default.nix

+14 −4
Original line number Diff line number Diff line 
{ 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";
@@ -12,8 +22,8 @@ buildPythonPackage rec { 
    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 = ''