diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-16 08:59:43 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-16 10:14:50 -0500 |
| commit | 78e7f444886379607b29cf27ae6ac7bd84ed6d20 (patch) | |
| tree | 623ce43817b00c12574bbc043d3f908f2eb948b8 /pkgs/desktops/kde-5 | |
| parent | b2cf5aabb0df860e5eff4e9692e2239b9c94b2cf (diff) | |
| download | nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.tar nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.tar.gz nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.tar.bz2 nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.tar.lz nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.tar.xz nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.tar.zst nixlib-78e7f444886379607b29cf27ae6ac7bd84ed6d20.zip | |
qt5.makeQtWrapper: do not inherit Qt search paths
Diffstat (limited to 'pkgs/desktops/kde-5')
| -rw-r--r-- | pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh index aab0625bf61a..6c8199f17d42 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh @@ -1,22 +1,31 @@ _ecmSetXdgDirs() { addToSearchPathOnce XDG_DATA_DIRS "$1/share" addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" - addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPathOnce RUNTIME_XDG_CONFIG_DIRS "$1/etc/xdg" } _ecmSharePaths=( \ + "appdata" \ + "applications" \ "config.cfg" \ + "dbus-1" \ + "desktop-directories" \ + "doc" \ + "icons" \ + "info" \ "kconf_update" \ "kservices5" \ "kservicetypes5" \ "knotifications5" \ - "applications" \ - "desktop-directories" \ + "kxmlgui5" \ + "locale" \ + "man" \ "mime" \ - "dbus-1" \ - "interfaces" \ - "services" \ - "system-services" ) + "polkit-1" \ + "sounds" \ + "templates" \ + "wallpapers" \ + ) _ecmPropagateNative() { for dir in ${_ecmSharePaths[@]}; do @@ -24,7 +33,7 @@ _ecmPropagateNative() { propagateOnce propagatedNativeBuildInputs "$1" if [ -z "$crossConfig" ]; then propagateOnce propagatedUserEnvPkgs "$1" - addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share" + addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share" fi break fi @@ -38,7 +47,7 @@ _ecmPropagate() { if [ -d "$1/share/$dir" ]; then propagateOnce propagatedBuildInputs "$1" propagateOnce propagatedUserEnvPkgs "$1" - addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share" + addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share" break fi done |