Replace "mergeOneOption" by "types.uniq".

svn path=/nixos/trunk/; revision=17074
2009-09-12 22:46:53 +00:00
parent 5c53a29a01
commit 6b0487d47f
1 changed files with 1 additions and 2 deletions
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -156,8 +156,7 @@ in

      job = mkOption {
        default = {};
-        type = types.optionSet;
-        merge = mergeOneOption;
+        type = types.uniq types.optionSet;
        description = "This option defines how to start the display manager.";

        options = {