kde5.extra-cmake-modules: propagate build inputs correctly

pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh

@@ -4,8 +4,7 @@ _ecmSetXdgDirs() {
     addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
 }
 
-_ecmPropagateSharedData() {
+_ecmSharePaths=( \
-    local sharedPaths=( \
     "config.cfg" \
     "kconf_update" \
     "kservices5" \
@@ -18,15 +17,35 @@ _ecmPropagateSharedData() {
     "interfaces" \
     "services" \
     "system-services" )
-    for dir in ${sharedPaths[@]}; do
+
+_ecmPropagateNative() {
+    for dir in ${_ecmSharePaths[@]}; do
         if [ -d "$1/share/$dir" ]; then
-            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            propagateOnce propagatedNativeBuildInputs "$1"
+            if [ -z "$crossConfig" ]; then
                 propagateOnce propagatedUserEnvPkgs "$1"
+                addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            fi
             break
         fi
     done
 }
 
+envHooks+=(_ecmSetXdgDirs _ecmPropagate)
+
+_ecmPropagate() {
+    for dir in ${_ecmSharePaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            break
+        fi
+    done
+}
+
+crossEnvHooks+=(_ecmPropagate)
+
 _ecmConfig() {
     # Because we need to use absolute paths here, we must set *all* the paths.
     cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
@@ -70,5 +89,4 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
 preConfigureHooks+=(_ecmConfig)