wrapGAppsHook: Revert "Correct `wrapProgram` invocations"

This reverts commit 8b9f153bb9c8156ec4f3d56d61845e432d19dcd6 of
https://github.com/NixOS/nixpkgs/pull/25183 because it breaks builds of
packages that don't install both a "bin" and a "libexec" directory. See
https://github.com/NixOS/nixpkgs/pull/25183#issuecomment-298064769 for more
details.

1 files changed, 3 insertions, 4 deletions

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 5d1cce6ee049..3cad1838d260 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -36,10 +36,9 @@ wrapGAppsHook() {
   done
 
   if [ -z "$dontWrapGApps" ]; then
-    find "${prefix}/bin" "${prefix}/libexec" -type f -executable -print0 \
-    | while IFS= read -r -d '' file; do
-      echo "Wrapping program $file"
-      wrapProgram "$file" "${gappsWrapperArgs[@]}"
+    for i in $prefix/bin/* $prefix/libexec/*; do
+      echo "Wrapping app $i"
+      wrapProgram "$i" "${gappsWrapperArgs[@]}"
     done
   fi
 }