1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-30 06:59:45 +01:00

xfconf: fix type order (#3961)

Submodules must come after strings, otherwise strings are treated as
paths and implicitly imported.
This commit is contained in:
Naïm Favier 2023-05-07 22:20:49 +02:00 committed by GitHub
parent 6fc82e5697
commit 017302483c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -75,14 +75,9 @@ in {
settings = mkOption {
type = with types;
attrsOf (attrsOf (oneOf [
bool
int
xfIntVariant
float
str
(listOf (oneOf [ bool int xfIntVariant float str ]))
])) // {
# xfIntVariant must come AFTER str; otherwise strings are treated as submodule imports...
let value = oneOf [ bool int float str xfIntVariant ];
in attrsOf (attrsOf (either value (listOf value))) // {
description = "xfconf settings";
};
default = { };