summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-03-08 18:04:55 +0100
committerDomen Kožar <domen@dev.si>2014-03-08 18:04:55 +0100
commitbb7fe59b80ca6da61239490e5c7858b11123fc3a (patch)
tree71a48f8a70af76453293b209b0257d16bfff9f6f /nixos
parent0047f42663f5e55b77a604def3d83bad61ba28b1 (diff)
parent958df8b9d12985431f7ec82978d7e8e6f852eb57 (diff)
downloadnixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.tar
nixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.tar.gz
nixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.tar.bz2
nixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.tar.lz
nixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.tar.xz
nixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.tar.zst
nixpkgs-bb7fe59b80ca6da61239490e5c7858b11123fc3a.zip
Merge pull request #1767 from the-kenny/fix-consoleKeyMap-type
i18n.consoleKeyMap: Accept string or path.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/i18n.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 56d541cb9b3..310739aa170 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -53,7 +53,11 @@ in
       };
 
       consoleKeyMap = mkOption {
-        type = types.str;
+        type = mkOptionType {
+          name = "string or path";
+          check = t: (isString t || types.path.check t);
+        };
+
         default = "us";
         example = "fr";
         description = ''