Merge branch 'ibus'

This commit is contained in:
Thomas Tuegel 2016-02-26 18:48:47 -06:00
commit 96425dfa09

View file

@ -17,7 +17,7 @@ let
[Desktop Entry] [Desktop Entry]
Name=IBus Name=IBus
Type=Application Type=Application
Exec=${ibusPackage}/bin/ibus-daemon -dx Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=refresh
''; '';
}; };
in in
@ -28,10 +28,14 @@ in
type = with types; listOf ibusEngine; type = with types; listOf ibusEngine;
default = []; default = [];
example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]"; example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]";
description = '' description =
Enabled IBus engines. let
Available engines can be found by running `nix-env "<nixpkgs>" . -qaP -A ibus-engines`. engines =
''; lib.concatStringsSep ", "
(map (name: "<literal>${name}</literal>")
(lib.attrNames pkgs.ibus-engines));
in
"Enabled IBus engines. Available engines are: ${engines}.";
}; };
}; };
}; };