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

Drop kde4.5-specific code 

svn path=/nixos/trunk/; revision=31486
This commit is contained in:
Yury G. Kudryashov 2012-01-11 22:58:32 +00:00
parent 70850268e0
commit 98f5e3b3b2
1 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,6 @@ let
cfg = xcfg.desktopManager.kde4; cfg = xcfg.desktopManager.kde4;
xorg = pkgs.xorg; xorg = pkgs.xorg;
isKDE47 = pkgs.kde4 ? kde_wallpapers;
# Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't # Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't
# really work very well (e.g. searching files often fails to find # really work very well (e.g. searching files often fails to find
# files), segfault sometimes and consume significant resources. # files), segfault sometimes and consume significant resources.
@ -83,10 +81,6 @@ in
sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
fi fi
${optionalString (!isKDE47) ''
export DBUS_FATAL_WARNINGS=0
''}
# Start KDE. # Start KDE.
exec ${pkgs.kde4.kdebase_workspace}/bin/startkde exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
''; '';
@ -101,28 +95,6 @@ in
}; };
environment.systemPackages = environment.systemPackages =
(if !isKDE47 then
# KDE <= 4.6
[ # temporary workarounds
pkgs.shared_desktop_ontologies
pkgs.strigi
pkgs.kde4.kdelibs
pkgs.kde4.kdebase
pkgs.kde4.kdebase_runtime
pkgs.kde4.kdebase_workspace
pkgs.kde4.oxygen_icons
pkgs.kde4.qt4 # needed for qdbus
pkgs.shared_mime_info
pkgs.gst_all.gstreamer
pkgs.gst_all.gstPluginsBase
pkgs.gst_all.gstPluginsGood
pkgs.gst_all.gstFfmpeg # for mp3 playback
xorg.xmessage # so that startkde can show error messages
xorg.xset # used by startkde, non-essential
] ++ optional (pkgs ? phonon_backend_gstreamer) pkgs.phonon_backend_gstreamer
else
# KDE >= 4.7
[ pkgs.kde4.kdelibs [ pkgs.kde4.kdelibs
pkgs.kde4.kde_baseapps # Splitted kdebase pkgs.kde4.kde_baseapps # Splitted kdebase
@ -156,7 +128,6 @@ in
pkgs.shared_desktop_ontologies # used by nepomuk pkgs.shared_desktop_ontologies # used by nepomuk
pkgs.strigi # used by nepomuk pkgs.strigi # used by nepomuk
] ]
)
++ [ nepomukConfig ] ++ [ nepomukConfig ]
++ config.environment.kdePackages; ++ config.environment.kdePackages;
@ -168,9 +139,8 @@ in
}; };
# Enable helpful DBus services. # Enable helpful DBus services.
services.hal = mkIf (!isKDE47) { enable = true; }; services.udisks.enable = true;
services.udisks = mkIf isKDE47 { enable = true; }; services.upower = mkIf config.powerManagement.enable { enable = true; };
services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable = true; };
security.pam.services = [ { name = "kde"; allowNullPassword = true; } ]; security.pam.services = [ { name = "kde"; allowNullPassword = true; } ];