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

Changed files
+18 -42
nixos
modules
pkgs
tools
inputmethods
top-level
+2 -2
nixos/modules/i18n/input-method/default.xml
···
<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>
+2 -16
nixos/modules/i18n/input-method/hime.nix
···
-
{ 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";
+1
nixos/modules/module-list.nix
···
./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
+11 -17
pkgs/tools/inputmethods/hime/default.nix
···
{
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";
···
};
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 ];
};
}
+2 -7
pkgs/top-level/all-packages.nix
···
google-amber = callPackage ../tools/graphics/amber { };
+
hime = callPackage ../tools/inputmethods/hime {};
+
hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
http2tcp = callPackage ../tools/networking/http2tcp { };
···
mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
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 { };