diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-24 09:45:40 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-24 09:47:13 -0500 |
| commit | b63d68ad831a5a1b029aef20d051188084714635 (patch) | |
| tree | bdfd2e1b91a2767f32c0de6979917e71174eaf5a | |
| parent | 58f532216f15260518c5db0a62d846bb3a2575a8 (diff) | |
| download | nixlib-b63d68ad831a5a1b029aef20d051188084714635.tar nixlib-b63d68ad831a5a1b029aef20d051188084714635.tar.gz nixlib-b63d68ad831a5a1b029aef20d051188084714635.tar.bz2 nixlib-b63d68ad831a5a1b029aef20d051188084714635.tar.lz nixlib-b63d68ad831a5a1b029aef20d051188084714635.tar.xz nixlib-b63d68ad831a5a1b029aef20d051188084714635.tar.zst nixlib-b63d68ad831a5a1b029aef20d051188084714635.zip | |
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.
| -rw-r--r-- | pkgs/desktops/kde-5/applications/kdelibs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh | 10 |
2 files changed, 0 insertions, 12 deletions
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) |