Allow overrides to work for unit options

2013-11-18 15:51:21 +01:00 · 2013-11-18 15:51:21 +01:00 · 8951be2d80
parent 33cb0bbb4b
commit 8951be2d80
1 changed files with 6 additions and 4 deletions
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@ -17,11 +17,13 @@ let
  unitOption = mkOptionType {
    name = "systemd option";
    merge = loc: defs:
-      let defs' = getValues defs;
+      let
+        defs' = filterOverrides defs;
+        defs'' = getValues defs';
      in
-        if isList (head defs')
-        then concatLists defs'
-        else mergeOneOption loc defs;
+        if isList (head defs'')
+        then concatLists defs''
+        else mergeOneOption loc defs';
  };

 in rec {