diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-23 10:07:09 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-25 13:06:30 -0500 |
| commit | 2f623ef52798e6b292f11a0a2955235ea85911a6 (patch) | |
| tree | 32fde4e6f878792cca28d03bea18c7f8132083d2 /pkgs/development/libraries/kde-frameworks | |
| parent | 4edb8ade3d3bf1e4ef7d8284a6a8454a530c14d3 (diff) | |
| download | nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.tar nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.tar.gz nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.tar.bz2 nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.tar.lz nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.tar.xz nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.tar.zst nixpkgs-2f623ef52798e6b292f11a0a2955235ea85911a6.zip | |
extra-cmake-modules: Remove doc/ from xdgDataSubdirs
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh | 10 |
1 files changed, 7 insertions, 3 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 4df086ddbf2..7b39a78deee 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 |