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
This commit is contained in:
parent
d81e10c735
commit
52b903b3c4
@ -252,8 +252,8 @@ i18n.inputMethod = {
|
||||
<para>
|
||||
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...
|
||||
</para>
|
||||
|
||||
<para>
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user