summary refs log tree commit diff
path: root/pkgs/build-support/setup-hooks
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-07-30 04:15:26 +0200
committerJan Tojnar <jtojnar@gmail.com>2017-08-05 13:23:05 +0200
commit0a142d311210d0898c538533e377a2696e3e33df (patch)
tree0294e5a57cb42fd5d9ab3d244ad8ae6f5ccefa0c /pkgs/build-support/setup-hooks
parentd4ef5ac0e962bd6604dda38617c4b98c77a62949 (diff)
downloadnixlib-0a142d311210d0898c538533e377a2696e3e33df.tar
nixlib-0a142d311210d0898c538533e377a2696e3e33df.tar.gz
nixlib-0a142d311210d0898c538533e377a2696e3e33df.tar.bz2
nixlib-0a142d311210d0898c538533e377a2696e3e33df.tar.lz
nixlib-0a142d311210d0898c538533e377a2696e3e33df.tar.xz
nixlib-0a142d311210d0898c538533e377a2696e3e33df.tar.zst
nixlib-0a142d311210d0898c538533e377a2696e3e33df.zip
wrap-gapps-hook: also wrap symlinks to executables
Some programs store the executable in a different place and link it
from the `bin` directory. For example, Polari links `$out/bin/polari`
to `$out/share/polari/org.gnome.Polari`. `wrapGAppsHook` did not follow
symlinks so it was not able to wrap Polari, making it unable to access
GObject introspection definitions required for running the program.

I made the wrapping script follow symlinks to fix this corner case.
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r--pkgs/build-support/setup-hooks/wrap-gapps-hook.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 9891128a6231..79b8d5b73fa1 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -39,7 +39,7 @@ wrapGAppsHook() {
     targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
     for targetDir in "${targetDirs[@]}"; do
       if [[ -d "${targetDir}" ]]; then
-        find "${targetDir}" -type f -executable -print0 \
+        find -L "${targetDir}" -type f -executable -print0 \
           | while IFS= read -r -d '' file; do
           echo "Wrapping program ${file}"
           wrapProgram "${file}" "${gappsWrapperArgs[@]}"