From 6b0487d47f3451a972c28f355c7045aa65b833da Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 12 Sep 2009 22:46:53 +0000
Subject: [PATCH] Replace "mergeOneOption" by "types.uniq".

svn path=/nixos/trunk/; revision=17074
---
 modules/services/x11/display-managers/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 54ed4dec2186..2582679e9e72 100644
--- 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 = {