diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-20 22:25:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 22:25:07 +0200 |
| commit | 6aac40d24615b43d3e82d3894492726c5c4b7159 (patch) | |
| tree | 898d5a3b8e4bb8eeab06658a08f0c63b9b97d203 /pkgs/tools/inputmethods | |
| parent | 5dcc65a25b6d117a78579f4e3dc12e1c687c72be (diff) | |
| parent | 8f9327501905129c4a6795c7dd3cf2e38df2d5af (diff) | |
| download | nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.tar nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.tar.gz nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.tar.bz2 nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.tar.lz nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.tar.xz nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.tar.zst nixpkgs-6aac40d24615b43d3e82d3894492726c5c4b7159.zip | |
Merge pull request #61978 from laMudri/ibus-table
ibus-engines.table: fix after update of settings infrastructure
Diffstat (limited to 'pkgs/tools/inputmethods')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 3f2ab1fc96a..8e34cb860a6 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub , autoreconfHook, docbook2x, pkgconfig , gtk3, dconf, gobject-introspection -, ibus, python3 }: +, ibus, python3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "ibus-table-${version}"; + pname = "ibus-table"; version = "1.9.21"; src = fetchFromGitHub { @@ -30,18 +30,29 @@ stdenv.mkDerivation rec { ''; 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 = '' substituteInPlace $sourceRoot/engine/Makefile.am \ --replace "docbook2man" "docbook2man --sgml" ''; - postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; { isIbusEngine = true; description = "An IBus framework for table-based input methods"; |