From 52b903b3c4bbdba141f0402774ab0f69f29dbfee Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Fri, 9 Oct 2020 23:32:58 +0800 Subject: [PATCH] hime: fix enable hime, remove hime-all package - fix inputMethod.enable hime by adding module list - rm hime-all package, because chewing, anthy modules does not work well --- nixos/modules/i18n/input-method/default.xml | 4 +-- nixos/modules/i18n/input-method/hime.nix | 18 ++----------- nixos/modules/module-list.nix | 1 + pkgs/tools/inputmethods/hime/default.nix | 28 ++++++++------------- pkgs/top-level/all-packages.nix | 9 ++----- 5 files changed, 18 insertions(+), 42 deletions(-) diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index e15f66690819..73911059f8a6 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -252,8 +252,8 @@ i18n.inputMethod = { Hime is an extremely easy-to-use input method framework. It is lightweight, stable, powerful and supports many commonly used input methods, including - Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Japanese Anthy, Korean Pinyin, - Latin Alphabet, Rancang hunting birds, cool music, etc... + Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Korean Pinyin, Latin Alphabet, + etc... diff --git a/nixos/modules/i18n/input-method/hime.nix b/nixos/modules/i18n/input-method/hime.nix index a1b346a0f840..8482130db3e3 100644 --- a/nixos/modules/i18n/input-method/hime.nix +++ b/nixos/modules/i18n/input-method/hime.nix @@ -1,23 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; { - options = { - i18n.inputMethod.hime = { - enableChewing = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable chewing input method"; - }; - enableAnthy = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable anthy input method"; - }; - }; - }; - config = mkIf (config.i18n.inputMethod.enabled == "hime") { + i18n.inputMethod.package = pkgs.hime; environment.variables = { GTK_IM_MODULE = "hime"; QT_IM_MODULE = "hime"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 39f28773eab0..0958e5612438 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -79,6 +79,7 @@ ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix + ./i18n/input-method/hime.nix ./i18n/input-method/ibus.nix ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index cce1ec495150..4d2b44456ae7 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, which, gtk2, gtk3, qt4, qt5, libXtst, lib, -enableChewing ? true, libchewing, -enableAnthy ? true, anthy, }: +# chewing and anthy do not work well +# so we do not enable these input method at this moment + stdenv.mkDerivation { name = "hime"; version = "unstable-2020-06-27"; @@ -16,25 +17,18 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ] - ++ lib.optional enableChewing libchewing - ++ lib.optional enableAnthy anthy; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; - patchPhase = '' - patchShebangs configure - ''; - - # The configure script already auto-detect libchewing and anthy, - # so we do not need additional flags for libchewing or anthy + preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; meta = with stdenv.lib; { - homepage = "http://hime-ime.github.io/"; - downloadPage = "https://github.com/hime-ime/hime/downloads"; - description = "A useful input method engine for Asia region"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ yanganto ]; + homepage = "http://hime-ime.github.io/"; + downloadPage = "https://github.com/hime-ime/hime/downloads"; + description = "A useful input method engine for Asia region"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ yanganto ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b0a366867d..20d1ecf2edb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1104,6 +1104,8 @@ in google-amber = callPackage ../tools/graphics/amber { }; + hime = callPackage ../tools/inputmethods/hime {}; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -5595,13 +5597,6 @@ in nabi = callPackage ../tools/inputmethods/nabi { }; - hime = callPackage ../tools/inputmethods/hime {}; - - hime-all = callPackage ../tools/inputmethods/hime { - enableChewing = true; - enableAnthy = true; - }; - nahid-fonts = callPackage ../data/fonts/nahid-fonts { }; namazu = callPackage ../tools/text/namazu { };