Merge pull request #25183 from ahmedtd/fix-wrap-gapps-hook

wrapGAppsHook: Correct `wrapProgram` invocations
2017-04-28 11:13:12 +02:00 · 2017-04-28 11:13:12 +02:00 · edcff000d4
commit edcff000d4
parent 7f3b857d0d 8b9f153bb9
1 changed files with 4 additions and 3 deletions
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@ -36,9 +36,10 @@ wrapGAppsHook() {
  done

  if [ -z "$dontWrapGApps" ]; then
-    for i in $prefix/bin/* $prefix/libexec/*; do
-      echo "Wrapping app $i"
-      wrapProgram "$i" "${gappsWrapperArgs[@]}"
+    find "${prefix}/bin" "${prefix}/libexec" -type f -executable -print0 \
+    | while IFS= read -r -d '' file; do
+      echo "Wrapping program $file"
+      wrapProgram "$file" "${gappsWrapperArgs[@]}"
    done
  fi
 }