xplayer: Patch dbus-python into plugin directly, remove pythonenv
Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
This commit is contained in:
parent
9172370874
commit
0729a314c5
1 changed files with 6 additions and 12 deletions
|
@ -25,13 +25,6 @@
|
||||||
, xapp
|
, xapp
|
||||||
, yelp-tools }:
|
, yelp-tools }:
|
||||||
|
|
||||||
let
|
|
||||||
pythonenv = python3.withPackages (ps: [
|
|
||||||
ps.pygobject3
|
|
||||||
ps.dbus-python # For one plugin
|
|
||||||
]);
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xplayer";
|
pname = "xplayer";
|
||||||
version = "2.4.4";
|
version = "2.4.4";
|
||||||
|
@ -66,6 +59,7 @@ stdenv.mkDerivation rec {
|
||||||
intltool
|
intltool
|
||||||
itstool
|
itstool
|
||||||
pkg-config
|
pkg-config
|
||||||
|
python3.pkgs.wrapPython
|
||||||
yelp-tools
|
yelp-tools
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
@ -82,15 +76,15 @@ stdenv.mkDerivation rec {
|
||||||
libpeas
|
libpeas
|
||||||
libxml2
|
libxml2
|
||||||
libxplayer-plparser
|
libxplayer-plparser
|
||||||
pythonenv
|
python3
|
||||||
xapp
|
xapp
|
||||||
# to satisfy configure script
|
# to satisfy configure script
|
||||||
pythonenv.pkgs.pygobject3
|
python3.pkgs.pygobject3
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/xplayer \
|
buildPythonPath ${python3.pkgs.dbus-python}
|
||||||
--prefix PATH : ${lib.makeBinPath [ pythonenv ]}
|
patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue