diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
| commit | 503081fa5be25e5054f490182a13f1c517e0664d (patch) | |
| tree | f1a5d09c71ff8fba0066b7d5481ed4b8da132ffa /pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh | |
| parent | 9b09b832fc390b306611b6ec3bfffcc4452629fe (diff) | |
| parent | 52af1d0930732142937b8db6c28b7fcd16770a7c (diff) | |
| download | nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.gz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.bz2 nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.lz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.xz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.zst nixlib-503081fa5be25e5054f490182a13f1c517e0664d.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 4df086ddbf21..35982e866284 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -53,13 +53,12 @@ ecmPostHook() { } postHooks+=(ecmPostHook) -xdgDataSubdirs=( - "doc" "config.kcfg" "kconf_update" "kservices5" "kservicetypes5" \ +xdgDataSubdirs=( \ + "config.kcfg" "kconf_update" "kservices5" "kservicetypes5" \ "kxmlgui5" "knotifications5" "icons" "locale" "sounds" "templates" \ "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ ) - ecmHostPathSeen=( ) ecmUnseenHostPath() { @@ -104,5 +103,10 @@ ecmHostPathHook() { then qtWrapperArgs+=(--prefix INFOPATH : "$infoDir") fi + + if [ -d "$1/dbus-1" ] + then + propagatedUserEnvPkgs+=" $1" + fi } -addEnvHooks "$hostOffset" ecmHostPathHook +addEnvHooks "$targetOffset" ecmHostPathHook |