public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrapGAppsHook: fix $gappsWrapperArgs as intended

Browse Source 
i.e. define it even if $dontWrapGApps is set, and document the intention.
This commit is contained in:
Vladimír Čunát 2015-11-09 15:38:26 +01:00
parent 3f074b8a1e
commit d10b9108f2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
View File

@ -8,9 +8,11 @@ find_gio_modules() {
envHooks+=(find_gio_modules) envHooks+=(find_gio_modules)
# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
wrapGAppsHook() { wrapGAppsHook() {
[ -z "$dontWrapGApps" ] || return # guard against running multiple times (e.g. due to propagation)
dontWrapGApps=1 # guard against running multiple times (e.g. due to propagation) [ -z "$wrapGAppsHookHasRun" ] || return
wrapGAppsHookHasRun=1
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
@ -33,10 +35,12 @@ wrapGAppsHook() {
gappsWrapperArgs+=(--prefix $v : "$dummy") gappsWrapperArgs+=(--prefix $v : "$dummy")
done done
for i in $prefix/bin/* $prefix/libexec/*; do if [ -z "$dontWrapGApps" ]; then
echo "Wrapping app $i" for i in $prefix/bin/* $prefix/libexec/*; do
wrapProgram "$i" "${gappsWrapperArgs[@]}" echo "Wrapping app $i"
done wrapProgram "$i" "${gappsWrapperArgs[@]}"
done
fi
} }
fixupOutputHooks+=(wrapGAppsHook) fixupOutputHooks+=(wrapGAppsHook)