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

Adjust nixos to latest changes in kde-4.7 in nixpkgs

Browse Source 
svn path=/nixos/trunk/; revision=28598
This commit is contained in:
Yury G. Kudryashov 2011-08-15 18:08:12 +00:00
parent 4790c147bf
commit 9177fc455d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ let
cfg = xcfg.desktopManager.kde4; cfg = xcfg.desktopManager.kde4;
xorg = pkgs.xorg; xorg = pkgs.xorg;
isKDE47 = !(pkgs.kde4 ? kdebase); isKDE47 = pkgs.kde4 ? kde_wallpapers;
in in
@ -106,17 +106,9 @@ in
else else
# KDE >= 4.7 # KDE >= 4.7
[ pkgs.kde4.kdelibs [ pkgs.kde4.kdelibs
pkgs.kde4.kde_baseapps pkgs.kde4.kdebase # contains kde-workspace etc.
pkgs.kde4.kde_runtime
pkgs.kde4.kde_workspace
pkgs.kde4.kde_wallpapers # contains kdm's default background pkgs.kde4.kde_wallpapers # contains kdm's default background
pkgs.kde4.oxygen_icons pkgs.kde4.oxygen_icons
pkgs.kde4.konsole
pkgs.kde4.kcolorchooser
pkgs.kde4.kdegraphics.ksnapshot
pkgs.kde4.kate
pkgs.kde4.kdegraphics.okular
pkgs.kde4.kdegraphics.gwenview
# Phonon backends. # Phonon backends.
pkgs.phonon_backend_gstreamer pkgs.phonon_backend_gstreamer
@ -133,6 +125,8 @@ in
xorg.xmessage # so that startkde can show error messages xorg.xmessage # so that startkde can show error messages
xorg.xset # used by startkde, non-essential xorg.xset # used by startkde, non-essential
xorg.xauth # used by kdesu xorg.xauth # used by kdesu
pkgs.shared_desktop_ontologies # used by nepomuk
pkgs.strigi # used by nepomuk
] ]
) ++ config.environment.kdePackages; ) ++ config.environment.kdePackages;