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

* Make the KDE modules work with KDE 4.2 and 4.3. Also, when using 

KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
This commit is contained in:
Eelco Dolstra 2009-09-13 11:09:58 +00:00
parent 2a1f28d923
commit 6e2914fb9b
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/services/x11/desktop-managers/kde-environment.nix
View File

@ -24,7 +24,7 @@ let
kdePackages = mkOption {
default = [];
example = [ pkgs.kde43.kdegames ];
example = [ pkgs.kde4.kdegames ];
type = types.list types.package;
description = ''
Additional KDE packages to be used when you use KDE as a desktop

15
modules/services/x11/desktop-managers/kde4.nix
View File

@ -40,24 +40,23 @@ in
start =
''
# Start KDE.
exec ${pkgs.kde43.kdebase_workspace}/bin/startkde
exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
'';
};
security.setuidPrograms = [ "kcheckpass" ];
environment.kdePackages =
[ pkgs.kde43.kdelibs
pkgs.kde43.kdebase
pkgs.kde43.kdebase_runtime
pkgs.kde43.kdebase_workspace
pkgs.kde43.oxygen_icons
[ pkgs.kde4.kdelibs
pkgs.kde4.kdebase
pkgs.kde4.kdebase_runtime
pkgs.kde4.kdebase_workspace
pkgs.shared_mime_info
];
] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
environment.x11Packages =
[ xorg.xmessage # so that startkde can show error messages
pkgs.qt4 # needed for qdbus
pkgs.kde4.qt4 # needed for qdbus
xorg.xset # used by startkde, non-essential
];

2
modules/services/x11/display-managers/kdm.nix
View File

@ -7,7 +7,7 @@ let
dmcfg = config.services.xserver.displayManager;
cfg = dmcfg.kdm;
inherit (pkgs.kde43) kdebase_workspace;
inherit (pkgs.kde4) kdebase_workspace;
defaultConfig =
''