diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 07:11:53 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 16:24:10 +0200 |
commit | 3c1563f49da173948f5150619233a97277a267e0 (patch) | |
tree | 9e85dc9fb91a033a955d1c1e5a7e1bb381b955d9 /pkgs/build-support | |
parent | 1716d62f633cd091fce0d61517bb79504c300d36 (diff) |
wrapGAppsHook: add wrapGApp helper
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 906b1db9d10ee..26a1107b85f34 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -8,6 +8,12 @@ find_gio_modules() { addEnvHooks "$targetOffset" find_gio_modules +wrapGApp() { + local program="$1" + shift 1 + wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@" +} + # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set. wrapGAppsHook() { # guard against running multiple times (e.g. due to propagation) @@ -52,7 +58,7 @@ wrapGAppsHook() { find "${targetDir}" -type f -executable -print0 \ | while IFS= read -r -d '' file; do echo "Wrapping program '${file}'" - wrapProgram "${file}" "${gappsWrapperArgs[@]}" + wrapGApp "${file}" done fi done @@ -71,7 +77,7 @@ wrapGAppsHook() { fi done echo "Wrapping link: '$linkPath'" - wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}" + wrapGApp "${linkPath}" done fi fi |