From a0e7572da745580edf3e194ae2bcb4bfc1a5fd1c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 14:36:57 +0000
Subject: [PATCH] * Only set kdePackages if the X server is enabled.  Otherwise
 we get   KDE 3 in the ISO image.

svn path=/nixos/trunk/; revision=15823
---
 system/system.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index d336eb81305..4d77a6a1260 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -274,15 +274,15 @@ rec {
   # The list of packages that need to appear in KDEDIRS,
   # XDG_CONFIG_DIRS and XDG_DATA_DIRS.
   # !!! This should be defined somewhere else.  
-  kdePackages = 
-    pkgs.lib.optionals (config.services.xserver.sessionType == "kde4")
+  kdePackages =
+    pkgs.lib.optionals (config.services.xserver.enable && config.services.xserver.sessionType == "kde4")
       [ pkgs.kde42.kdelibs
         pkgs.kde42.kdebase
         pkgs.kde42.kdebase_runtime
         pkgs.kde42.kdebase_workspace
         pkgs.shared_mime_info
       ]
-    ++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde")
+    ++ pkgs.lib.optionals (config.services.xserver.enable && config.services.xserver.sessionType == "kde")
       [ pkgs.kdebase
         pkgs.kdelibs
       ]