From b63d68ad831a5a1b029aef20d051188084714635 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 24 Aug 2016 09:45:40 -0500 Subject: kdelibs: remove setup hook Fixes #17346. The kdelibs setup hook unnecessarily propagates kdelibs into the system environment, leading to KDE 4 services running in a KDE 5 session. --- pkgs/desktops/kde-5/applications/kdelibs/default.nix | 2 -- pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh | 10 ---------- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index 4ddc25ba6443..b93aea764a35 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -36,8 +36,6 @@ kdeApp { "-DKDE_DEFAULT_HOME=.kde" ]; - setupHook = ./setup-hook.sh; - meta = { platforms = lib.platforms.linux; homepage = "http://www.kde.org"; diff --git a/pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh deleted file mode 100644 index e0a75dc8acd0..000000000000 --- a/pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh +++ /dev/null @@ -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) -- cgit 1.4.1