diff options
author | Peter Simons <simons@cryp.to> | 2017-04-28 11:13:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-28 11:13:12 +0200 |
commit | edcff000d4947a45616ea7d53d243f982f92e2fb (patch) | |
tree | 1b507beec51b1e73a70110f1031725d16f30d455 /pkgs/build-support/setup-hooks | |
parent | 7f3b857d0d08c5e7d8d0ecdb2a53f06cc48a9cdf (diff) | |
parent | 8b9f153bb9c8156ec4f3d56d61845e432d19dcd6 (diff) | |
download | nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.tar nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.tar.gz nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.tar.bz2 nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.tar.lz nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.tar.xz nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.tar.zst nixlib-edcff000d4947a45616ea7d53d243f982f92e2fb.zip |
Merge pull request #25183 from ahmedtd/fix-wrap-gapps-hook
wrapGAppsHook: Correct `wrapProgram` invocations
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 3cad1838d260..5d1cce6ee049 100644 --- 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 } |