Merge pull request #249223 from NickCao/fcitx

nixos/fcitx5: fix evaluation
This commit is contained in:
Nick Cao 2023-08-14 18:19:08 -06:00 committed by GitHub
commit eb2b0b09b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -107,14 +107,14 @@ in
};
in
lib.attrsets.mergeAttrsList [
(optionalFile "config" (lib.generators.toINI { }) sts.globalOptions)
(optionalFile "profile" (lib.generators.toINI { }) sts.inputMethod)
(optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions)
(optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod)
(lib.concatMapAttrs
(name: value: optionalFile
"conf/${name}.conf"
(lib.generators.toINIWithGlobalSection { })
value)
sts.addons)
cfg.settings.addons)
];
environment.variables = {