wrapGAppsHook: Revert "Correct wrapProgram invocations"

This reverts commit 8b9f153 of #25183 because it breaks builds of packages that don't install both a "bin" and a "libexec" directory. See #25183 (comment) for more details.
NixOS · Apr 28, 2017 · 5c25c33 · 5c25c33
1 parent 1d8c6aa
commit 5c25c33
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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
 }