wrapGAppsHook: Revert "Correct wrapProgram invocations"

This reverts commit 8b9f153bb9 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.
This commit is contained in:
Peter Simons 2017-04-28 20:01:33 +02:00
parent 1d8c6aa5f2
commit 5c25c33a05

View file

@ -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
}