diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-09-06 11:42:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 11:42:28 -0500 |
| commit | caac16a924560abcc8e56a413963caf608776c26 (patch) | |
| tree | d76916b2d2d714d9feb8aad0c4e9b7f3825827a3 /nixos | |
| parent | 472ac50f5b10f4b3b4bfc03399dc2e34425f18b6 (diff) | |
| parent | 314c30cbf14088d397e9777acafa659bce7c715a (diff) | |
| download | nixlib-caac16a924560abcc8e56a413963caf608776c26.tar nixlib-caac16a924560abcc8e56a413963caf608776c26.tar.gz nixlib-caac16a924560abcc8e56a413963caf608776c26.tar.bz2 nixlib-caac16a924560abcc8e56a413963caf608776c26.tar.lz nixlib-caac16a924560abcc8e56a413963caf608776c26.tar.xz nixlib-caac16a924560abcc8e56a413963caf608776c26.tar.zst nixlib-caac16a924560abcc8e56a413963caf608776c26.zip | |
Merge pull request #18362 from ericsagnes/fix/im-description
input-methods modules: fix engine description
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/i18n/input-method/fcitx.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/i18n/input-method/ibus.nix | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/nixos/modules/i18n/input-method/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix index e97bb9f80eb5..440f13b41522 100644 --- a/nixos/modules/i18n/input-method/fcitx.nix +++ b/nixos/modules/i18n/input-method/fcitx.nix @@ -20,10 +20,9 @@ in example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]"; description = let - engines = - lib.concatStringsSep ", " - (map (name: "<literal>${name}</literal>") - (lib.attrNames pkgs.fcitx-engines)); + enginesDrv = filterAttrs (const isDerivation) pkgs.fcitx-engines; + engines = concatStringsSep ", " + (map (name: "<literal>${name}</literal>") (attrNames enginesDrv)); in "Enabled Fcitx engines. Available engines are: ${engines}."; }; diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index 097a662c3c6d..d64cf2f283bf 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -30,10 +30,9 @@ in example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]"; description = let - engines = - lib.concatStringsSep ", " - (map (name: "<literal>${name}</literal>") - (lib.attrNames pkgs.ibus-engines)); + enginesDrv = filterAttrs (const isDerivation) pkgs.ibus-engines; + engines = concatStringsSep ", " + (map (name: "<literal>${name}</literal>") (attrNames enginesDrv)); in "Enabled IBus engines. Available engines are: ${engines}."; }; |