git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #61978 from laMudri/ibus-table

ibus-engines.table: fix after update of settings infrastructure

commit6aac40d24615b43d3e82d3894492726c5c4b7159 authorJan Tojnar <jtojnar@gmail.com> dateTue 20 Aug 2019, 22:25 (7 years ago) parent5dcc65a8f93275
1 file changed+17−6
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix+17−6
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix+17−6
@@ -1,10 +1,10 @@
11{ stdenv, fetchFromGitHub
22, autoreconfHook, docbook2x, pkgconfig
33, gtk3, dconf, gobject-introspection
4−, ibus, python3 }:
4+, ibus, python3, wrapGAppsHook }:
55
66stdenv.mkDerivation rec {
7− name = "ibus-table-${version}";
7+ pname = "ibus-table";
88 version = "1.9.21";
99
1010 src = fetchFromGitHub {
@@ -30,18 +30,29 @@ stdenv.mkDerivation rec {
3030 '';
3131
3232 buildInputs = [
33− dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ]))
33+ dconf
34+ gtk3
35+ gobject-introspection
36+ ibus
37+ (python3.withPackages (pypkgs: with pypkgs; [
38+ pygobject3
39+ (toPythonModule ibus)
40+ ]))
3441 ];
3542
36− nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ];
43+ nativeBuildInputs = [
44+ autoreconfHook
45+ docbook2x
46+ pkgconfig
47+ python3.pkgs.wrapPython
48+ wrapGAppsHook
49+ ];
3750
3851 postUnpack = ''
3952 substituteInPlace $sourceRoot/engine/Makefile.am \
4053 --replace "docbook2man" "docbook2man --sgml"
4154 '';
4255
43− postFixup = "wrapPythonPrograms";
44−
4556 meta = with stdenv.lib; {
4657 isIbusEngine = true;
4758 description = "An IBus framework for table-based input methods";