public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fcitx-with-plugins: add fcitx-configtool and fcitx-qt5

Browse Source
This commit is contained in:
Eric Sagnes
2016-02-17 20:44:29 +09:00
parent 850be632a0
commit 295d670024
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/i18n/inputMethod/fcitx.nix
+1 -1
View File
@@ -39,7 +39,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ fcitxPackage ]; environment.systemPackages = [ fcitxPackage ];
gtkPlugins = [ fcitxPackage ]; gtkPlugins = [ fcitxPackage ];
qtPlugins = [ fcitxPackage pkgs.kde5.fcitx-qt5 ]; qtPlugins = [ fcitxPackage ];
environment.variables = { environment.variables = {
GTK_IM_MODULE = "fcitx"; GTK_IM_MODULE = "fcitx";
pkgs/tools/inputmethods/fcitx/wrapper.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, buildEnv, fcitx, makeWrapper, plugins }: { stdenv, buildEnv, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
# This is based on the pidgin-with-plugins package. # This is based on the pidgin-with-plugins package.
# Users should be able to configure what plugins are used # Users should be able to configure what plugins are used
@@ -16,7 +16,7 @@ let
drv = buildEnv { drv = buildEnv {
name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version; name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version;
paths = [ fcitx ] ++ plugins; paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins;
postBuild = '' postBuild = ''
# TODO: This could be avoided if buildEnv could be forced to create all directories # TODO: This could be avoided if buildEnv could be forced to create all directories