Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 62973ddc0798
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47df740549e6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 3, 2019

  1. ibus-engines.hangul: format with nixpkgs-fmt

    @jtojnar
    jtojnar committed Sep 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    743a626 View commit details

  2. ibus-engines.hangul: fix ibus-setup-hangul 

    Closes: #27619
    @jtojnar
    jtojnar committed Sep 3, 2019
    Copy the full SHA
    b73406d View commit details

  3. Merge pull request #68008 from jtojnar/ibus-fixes 

    ibus-engines.hangul: fix ibus-setup-hangul
    @jtojnar
    jtojnar authored Sep 3, 2019
    Copy the full SHA
    47df740 View commit details
Showing with 49 additions and 10 deletions.
  1. +36 −10 pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
  2. +13 −0 pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
46 changes: 36 additions & 10 deletions pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{ stdenv, fetchurl, intltool, pkgconfig
, gtk3, ibus, libhangul, python3
{ stdenv
, fetchurl
, substituteAll
, intltool
, pkgconfig
, wrapGAppsHook
, gtk3
, ibus
, libhangul
, python3
}:

stdenv.mkDerivation rec {
@@ -11,18 +19,36 @@ stdenv.mkDerivation rec {
sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
};

buildInputs = [ gtk3 ibus libhangul python3 ];
patches = [
(substituteAll {
src = ./fix-paths.patch;
libhangul = "${libhangul}/lib/libhangul.so.1";
})
];

nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
nativeBuildInputs = [
intltool
pkgconfig
python3.pkgs.wrapPython
wrapGAppsHook
];

postFixup = "wrapPythonPrograms";
buildInputs = [
gtk3
ibus
libhangul
(python3.withPackages (pypkgs: with pypkgs; [
pygobject3
(toPythonModule ibus)
]))
];

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;
};
}
13 changes: 13 additions & 0 deletions pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -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]