From 743a62673f4e00ae74b826643b1445371e0378fe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Sep 2019 14:36:08 +0200 Subject: [PATCH 1/2] ibus-engines.hangul: format with nixpkgs-fmt --- .../ibus-engines/ibus-hangul/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 3b8b3489a1d..9d1c8c5cc1b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, python3 +{ stdenv +, fetchurl +, intltool +, pkgconfig +, gtk3 +, ibus +, libhangul +, python3 }: stdenv.mkDerivation rec { @@ -11,18 +17,27 @@ stdenv.mkDerivation rec { sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; - buildInputs = [ gtk3 ibus libhangul python3 ]; + nativeBuildInputs = [ + intltool + pkgconfig + python3.pkgs.wrapPython + ]; - nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; + buildInputs = [ + gtk3 + ibus + libhangul + python3 + ]; postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { isIbusEngine = true; - description = "Ibus Hangul engine"; - homepage = https://github.com/choehwanjin/ibus-hangul; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ ericsagnes ]; + description = "Ibus Hangul engine"; + homepage = https://github.com/choehwanjin/ibus-hangul; + license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; }; } From b73406d863bc666509766409693ef383f043a828 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Sep 2019 14:39:08 +0200 Subject: [PATCH 2/2] ibus-engines.hangul: fix ibus-setup-hangul Closes: https://github.com/NixOS/nixpkgs/issues/27619 --- .../ibus-engines/ibus-hangul/default.nix | 17 ++++++++++++++--- .../ibus-engines/ibus-hangul/fix-paths.patch | 13 +++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 9d1c8c5cc1b..0a38ccfa3bd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchurl +, substituteAll , intltool , pkgconfig +, wrapGAppsHook , gtk3 , ibus , libhangul @@ -17,21 +19,30 @@ stdenv.mkDerivation rec { sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + libhangul = "${libhangul}/lib/libhangul.so.1"; + }) + ]; + nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython + wrapGAppsHook ]; buildInputs = [ gtk3 ibus libhangul - python3 + (python3.withPackages (pypkgs: with pypkgs; [ + pygobject3 + (toPythonModule ibus) + ])) ]; - postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; { isIbusEngine = true; description = "Ibus Hangul engine"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch new file mode 100644 index 00000000000..7487d074d55 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/setup/main.py b/setup/main.py +index 8d581cd..2ac47b9 100644 +--- a/setup/main.py ++++ b/setup/main.py +@@ -37,7 +37,7 @@ + + def get_hangul_keyboard_list(): + from ctypes import CDLL, c_int, c_char_p +- libhangul = CDLL('libhangul.so.1') ++ libhangul = CDLL('@libhangul@') + libhangul.hangul_ic_get_n_keyboards.argtypes = [] + libhangul.hangul_ic_get_n_keyboards.restype = c_int + libhangul.hangul_ic_get_keyboard_id.argtypes = [c_int]