types.attrsOf: Use mergeDefinitions to handle each element

This simplifes typechecking and allows properties to be used inside of
the attribute sets.

This fixes the empty synergy-client and synergy-server services
previously generated on systems with synergy disabled.

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/types.nix b/lib/types.nix
index 58fb05b9f0e50..a5b9d59e30ffa 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -126,12 +126,16 @@ in rec {
 
     attrsOf = elemType: mkOptionType {
       name = "attribute set of ${elemType.name}s";
-      check = x: isAttrs x && all elemType.check (attrValues x);
+      check = isAttrs;
       merge = loc: defs:
-        zipAttrsWith (name: elemType.merge (loc ++ [name]))
+        mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
+          let
+            inherit (mergeDefinitions (loc ++ [name]) elemType defs)
+              defsFinal mergedValue;
+          in if defsFinal == [] then {} else { value = mergedValue; })
           # Push down position info.
           (map (def: listToAttrs (mapAttrsToList (n: def':
-            { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs);
+            { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs)));
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: attrsOf (elemType.substSubModules m);