From cc0d38b58e5127007ad4126fb2e43a9e8df7a52a Mon Sep 17 00:00:00 2001
From: Gaute Ravndal <gaute.ravndal@gmail.com>
Date: Wed, 6 Jul 2022 18:33:21 +0200
Subject: [PATCH] nixos/i18n: normalise locale codeset names in
 supportedLocales

---
 nixos/modules/config/i18n.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 60af360a2a5..cdf5c661e5e 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -53,16 +53,16 @@ with lib;
 
       supportedLocales = mkOption {
         type = types.listOf types.str;
-        default = builtins.map (l: l + "/UTF-8")
-          (unique (
+        default = unique
+          (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (
             [
               "C.UTF-8"
               config.i18n.defaultLocale
             ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
           ));
         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"
                 config.i18n.defaultLocale