makeQtWrapper: wrap XDG directories

pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh

@@ -2,6 +2,8 @@ addQtDependency() {
     addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins"
     addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
     addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPath XDG_DATA_DIRS "$1/share"
 }
 
 wrapQtProgram() {
@@ -11,6 +13,8 @@ wrapQtProgram() {
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
         --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
+        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
         "$@"
 }
 
@@ -23,6 +27,8 @@ makeQtWrapper() {
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
         --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
+        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
         "$@"
 }
 
@@ -30,6 +36,7 @@ makeQtWrapper() {
 export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins"
 export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports"
 export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml"
+export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg"
 export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share"
 
 envHooks+=(addQtDependency)

pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh

@@ -22,7 +22,7 @@ addQtModule() {
 
 propagateRuntimeDeps() {
     local propagated
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do
         if [[ -d "$1/$dir" ]]; then
             propagated=
             for pkg in $propagatedBuildInputs; do