ibus-engines.libpinyin: fix runtime deps

* We need PyGObject since it is not propagated by ibus anymore.
* With python.withPackage, we no longer need wrapPython.
* We need wrapGAppsHook still, to find GSettings schemas.
This commit is contained in:
Jan Tojnar
2019-12-05 21:05:44 +01:00
parent 3140fa89c5
commit 7b530d0158
@@ -1,6 +1,16 @@
{ stdenv, fetchFromGitHub, autoreconfHook { stdenv
, intltool, pkgconfig, sqlite, libpinyin, db , fetchFromGitHub
, ibus, glib, gtk3, python3 , autoreconfHook
, intltool
, pkgconfig
, wrapGAppsHook
, sqlite
, libpinyin
, db
, ibus
, glib
, gtk3
, python3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -8,26 +18,41 @@ stdenv.mkDerivation rec {
version = "1.10.0"; version = "1.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libpinyin"; owner = "libpinyin";
repo = "ibus-libpinyin"; repo = "ibus-libpinyin";
rev = version; rev = version;
sha256 = "0zkzz6ig74nws8phqxbsggnpf5g5f2hxi0mdyn2m3s4nm14q3ma6"; sha256 = "0zkzz6ig74nws8phqxbsggnpf5g5f2hxi0mdyn2m3s4nm14q3ma6";
}; };
buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; nativeBuildInputs = [
nativeBuildInputs = [ autoreconfHook intltool pkgconfig python3.pkgs.wrapPython ]; autoreconfHook
intltool
pkgconfig
wrapGAppsHook
];
buildInputs = [
ibus
glib
sqlite
libpinyin
(python3.withPackages (pypkgs: with pypkgs; [
pygobject3
(toPythonModule ibus)
]))
gtk3
db
];
postAutoreconf = '' postAutoreconf = ''
intltoolize intltoolize
''; '';
postFixup = "wrapPythonPrograms";
meta = with stdenv.lib; { meta = with stdenv.lib; {
isIbusEngine = true; isIbusEngine = true;
description = "IBus interface to the libpinyin input method"; description = "IBus interface to the libpinyin input method";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ ericsagnes ]; maintainers = with maintainers; [ ericsagnes ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }