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.
This commit is contained in:
parent
1d8c6aa5f2
commit
5c25c33a05
@ -36,10 +36,9 @@ wrapGAppsHook() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ -z "$dontWrapGApps" ]; then
|
if [ -z "$dontWrapGApps" ]; then
|
||||||
find "${prefix}/bin" "${prefix}/libexec" -type f -executable -print0 \
|
for i in $prefix/bin/* $prefix/libexec/*; do
|
||||||
| while IFS= read -r -d '' file; do
|
echo "Wrapping app $i"
|
||||||
echo "Wrapping program $file"
|
wrapProgram "$i" "${gappsWrapperArgs[@]}"
|
||||||
wrapProgram "$file" "${gappsWrapperArgs[@]}"
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user