From da0d5c564547cc09388147e90cac9a1e0f66c4fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Jul 2010 14:33:11 +0000
Subject: [PATCH] * Use config.system.build.grub rather than pkgs.grub to get
 the right   GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
---
 modules/services/x11/display-managers/kdm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 15553ba386b..a88b34dc5ac 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -94,7 +94,9 @@ in
   config = mkIf cfg.enable {
   
     services.xserver.displayManager.job =
-      { execCmd = "PATH=${pkgs.grub}/sbin:$PATH exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
+      { execCmd =
+          (optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
+          "exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
         logsXsession = true;
       };