From e362442562576dcf76e914a69e0cc8557311635b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 Jul 2016 14:08:29 -0500 Subject: [PATCH] kde5: avoid propagating dev outputs to reduce closure size --- .../libraries/kde-frameworks/setup-hook.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/setup-hook.sh index 5363f4e30fdc..285ad5522533 100644 --- a/pkgs/development/libraries/kde-frameworks/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/setup-hook.sh @@ -22,12 +22,13 @@ _ecmSharePaths=( \ "polkit-1" \ "sounds" \ "templates" \ - "wallpapers" \ - ) + "wallpapers" ) _ecmPropagateNative() { + local target for dir in ${_ecmSharePaths[@]}; do - if [ -d "$1/share/$dir" ]; then + target=$(readlink -m "$1/share/$dir") + if [ "$target" != "$1/share" ] && [ -d "$target" ]; then propagateOnce propagatedNativeBuildInputs "$1" if [ -z "$crossConfig" ]; then propagateOnce propagatedUserEnvPkgs "$1" @@ -41,8 +42,10 @@ _ecmPropagateNative() { envHooks+=(_ecmSetXdgDirs _ecmPropagate) _ecmPropagate() { + local target for dir in ${_ecmSharePaths[@]}; do - if [ -d "$1/share/$dir" ]; then + target=$(readlink -m "$1/share/$dir") + if [ "$target" != "$1/share" ] && [ -d "$target" ]; then propagateOnce propagatedBuildInputs "$1" propagateOnce propagatedUserEnvPkgs "$1" addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share"