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

kdelibs: remove setup hook

Browse Source 
Fixes #17346.

The kdelibs setup hook unnecessarily propagates kdelibs into the system
environment, leading to KDE 4 services running in a KDE 5 session.
This commit is contained in:
Thomas Tuegel 2016-08-24 09:45:40 -05:00
parent 58f532216f
commit b63d68ad83
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-5/applications/kdelibs/default.nix
View File

@ -36,8 +36,6 @@ kdeApp {
"-DKDE_DEFAULT_HOME=.kde" "-DKDE_DEFAULT_HOME=.kde"
]; ];
setupHook = ./setup-hook.sh;
meta = { meta = {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
homepage = "http://www.kde.org"; homepage = "http://www.kde.org";

10
pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh
View File

@ -1,10 +0,0 @@
addQt4Plugins() {
if [[ -d "$1/lib/qt4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
if [[ -d "$1/lib/kde4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
}
envHooks+=(addQt4Plugins)