public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Only set kdePackages if the X server is enabled. Otherwise we get 

KDE 3 in the ISO image.

svn path=/nixos/trunk/; revision=15823
This commit is contained in:
Eelco Dolstra 2009-06-02 14:36:57 +00:00
parent 5ed2a75f50
commit a0e7572da7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/system.nix
View File

@ -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
]