diff options
author | Peter Simons <simons@cryp.to> | 2017-04-28 20:01:33 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-04-28 20:01:33 +0200 |
commit | 5c25c33a05720f6bf947970f142b72e991e05366 (patch) | |
tree | 137b339b362243a29e8b83caff66a310f0dc1521 | |
parent | 1d8c6aa5f2981c630b767e449f95a038fb81d9fc (diff) | |
download | nixlib-5c25c33a05720f6bf947970f142b72e991e05366.tar nixlib-5c25c33a05720f6bf947970f142b72e991e05366.tar.gz nixlib-5c25c33a05720f6bf947970f142b72e991e05366.tar.bz2 nixlib-5c25c33a05720f6bf947970f142b72e991e05366.tar.lz nixlib-5c25c33a05720f6bf947970f142b72e991e05366.tar.xz nixlib-5c25c33a05720f6bf947970f142b72e991e05366.tar.zst nixlib-5c25c33a05720f6bf947970f142b72e991e05366.zip |
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.
-rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 7 |
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 } |