Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from Aug 20, 2019
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba21259
ibus-engines.table: fix after update of settings infrastructure
laMudri May 19, 2019
549c146
ibus-engines.table: remove hacky change to source code
laMudri Jun 1, 2019
8f93275
ibus-engines.table: fit Python package name conventions
laMudri Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 17 additions & 6 deletions pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
View file
Open in desktop
@@ -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 {
Expand All @@ -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";
Expand Down