From 0729a314c54a5fe16df8114dd33e1910aff50de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 00:59:00 -0300 Subject: [PATCH] xplayer: Patch dbus-python into plugin directly, remove pythonenv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/applications/video/xplayer/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 20a9772021a9..baa8fcb95be0 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -25,13 +25,6 @@ , xapp , yelp-tools }: -let - pythonenv = python3.withPackages (ps: [ - ps.pygobject3 - ps.dbus-python # For one plugin - ]); -in - stdenv.mkDerivation rec { pname = "xplayer"; version = "2.4.4"; @@ -66,6 +59,7 @@ stdenv.mkDerivation rec { intltool itstool pkg-config + python3.pkgs.wrapPython yelp-tools gobject-introspection ]; @@ -82,15 +76,15 @@ stdenv.mkDerivation rec { libpeas libxml2 libxplayer-plparser - pythonenv + python3 xapp # to satisfy configure script - pythonenv.pkgs.pygobject3 + python3.pkgs.pygobject3 ]; - postInstall = '' - wrapProgram $out/bin/xplayer \ - --prefix PATH : ${lib.makeBinPath [ pythonenv ]} + postFixup = '' + buildPythonPath ${python3.pkgs.dbus-python} + patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py ''; meta = with lib; {