b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/i18n: normalise locale codeset names in supportedLocales

Browse source
This commit is contained in:
Gaute Ravndal 2022-07-06 18:33:21 +02:00
parent 49546f4413
commit cc0d38b58e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/config/i18n.nix
View file

@ -53,16 +53,16 @@ with lib;
supportedLocales = mkOption { supportedLocales = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = builtins.map (l: l + "/UTF-8") default = unique
(unique ( (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (
[ [
"C.UTF-8" "C.UTF-8"
config.i18n.defaultLocale config.i18n.defaultLocale
] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
)); ));
defaultText = literalExpression '' defaultText = literalExpression ''
builtins.map (l: l + "/UTF-8") unique
(unique ( (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (
[ [
"C.UTF-8" "C.UTF-8"
config.i18n.defaultLocale config.i18n.defaultLocale