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

wrapGAppsHook: Correct `wrapProgram` invocations
NixOS · Apr 28, 2017 · edcff00 · edcff00 · pbogdan · Apr 28, 2017
2 parents 7f3b857 + 8b9f153
commit edcff00
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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
 }