Merge pull request #61978 from laMudri/ibus-table

ibus-engines.table: fix after update of settings infrastructure
This commit is contained in:
Jan Tojnar 2019-08-20 22:25:07 +02:00 committed by GitHub
commit 6aac40d246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, autoreconfHook, docbook2x, pkgconfig , autoreconfHook, docbook2x, pkgconfig
, gtk3, dconf, gobject-introspection , gtk3, dconf, gobject-introspection
, ibus, python3 }: , ibus, python3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ibus-table-${version}"; pname = "ibus-table";
version = "1.9.21"; version = "1.9.21";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -30,18 +30,29 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ])) dconf
gtk3
gobject-introspection
ibus
(python3.withPackages (pypkgs: with pypkgs; [
pygobject3
(toPythonModule ibus)
]))
]; ];
nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ]; nativeBuildInputs = [
autoreconfHook
docbook2x
pkgconfig
python3.pkgs.wrapPython
wrapGAppsHook
];
postUnpack = '' postUnpack = ''
substituteInPlace $sourceRoot/engine/Makefile.am \ substituteInPlace $sourceRoot/engine/Makefile.am \
--replace "docbook2man" "docbook2man --sgml" --replace "docbook2man" "docbook2man --sgml"
''; '';
postFixup = "wrapPythonPrograms";
meta = with stdenv.lib; { meta = with stdenv.lib; {
isIbusEngine = true; isIbusEngine = true;
description = "An IBus framework for table-based input methods"; description = "An IBus framework for table-based input methods";