From ba21259d655cddcae23df4d5eb137ad5b6354896 Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Sun, 19 May 2019 13:11:11 +0100
Subject: [PATCH 1/3] ibus-engines.table: fix after update of settings
 infrastructure

Fixes #56621. Adds a wrapper to deal with gsettings, and includes a hack to make
things actually work (postFixup).
---
 .../ibus-engines/ibus-table/default.nix          | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 3f2ab1fc96a9..a0afb9d3355d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, docbook2x, pkgconfig
 , gtk3, dconf, gobject-introspection
-, ibus, python3 }:
+, ibus, python3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
@@ -33,14 +33,24 @@ stdenv.mkDerivation rec {
     dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ]))
   ];
 
-  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";
+  postFixup = ''
+    wrapPythonPrograms
+    sed -e 's/LookupTable/LookupTable.new/' \
+        -i "$out/share/ibus-table/engine/table.py"
+  '';
 
   meta = with stdenv.lib; {
     isIbusEngine = true;

From 549c14606efe85fc40dc1ea2d7aaa4ac71a0d60c Mon Sep 17 00:00:00 2001
From: James Wood <jammyatjammy@gmail.com>
Date: Sun, 2 Jun 2019 00:30:20 +0100
Subject: [PATCH 2/3] ibus-engines.table: remove hacky change to source code

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
---
 .../ibus-engines/ibus-table/default.nix           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index a0afb9d3355d..88dcabd11f5c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -30,7 +30,14 @@ 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 = [
@@ -46,12 +53,6 @@ stdenv.mkDerivation rec {
       --replace "docbook2man" "docbook2man --sgml"
   '';
 
-  postFixup = ''
-    wrapPythonPrograms
-    sed -e 's/LookupTable/LookupTable.new/' \
-        -i "$out/share/ibus-table/engine/table.py"
-  '';
-
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description  = "An IBus framework for table-based input methods";

From 8f9327501905129c4a6795c7dd3cf2e38df2d5af Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Mon, 19 Aug 2019 19:47:50 +0100
Subject: [PATCH 3/3] ibus-engines.table: fit Python package name conventions

---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 88dcabd11f5c..8e34cb860a65 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -4,7 +4,7 @@
 , ibus, python3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "ibus-table-${version}";
+  pname = "ibus-table";
   version = "1.9.21";
 
   src = fetchFromGitHub {