From ba21259d655cddcae23df4d5eb137ad5b6354896 Mon Sep 17 00:00:00 2001 From: laMudri Date: Sun, 19 May 2019 13:11:11 +0100 Subject: [PATCH] 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 3f2ab1fc96a..a0afb9d3355 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;