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

wrapGAppsHook: avoid running multiple times

Browse Source 
/cc #10351 and @lethalman.
This commit is contained in:
Vladimír Čunát 2015-11-09 15:18:13 +01:00
parent 5149c03adc
commit 3f074b8a1e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,9 @@ find_gio_modules() {
envHooks+=(find_gio_modules) envHooks+=(find_gio_modules)
wrapGAppsHook() { wrapGAppsHook() {
[ -z "$dontWrapGApps" ] || return
dontWrapGApps=1 # guard against running multiple times (e.g. due to propagation)
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")
fi fi
@ -30,12 +33,10 @@ wrapGAppsHook() {
gappsWrapperArgs+=(--prefix $v : "$dummy") gappsWrapperArgs+=(--prefix $v : "$dummy")
done done
if [ -z "$dontWrapGApps" ]; then for i in $prefix/bin/* $prefix/libexec/*; do
for i in $prefix/bin/* $prefix/libexec/*; do echo "Wrapping app $i"
echo "Wrapping app $i" wrapProgram "$i" "${gappsWrapperArgs[@]}"
wrapProgram "$i" "${gappsWrapperArgs[@]}" done
done
fi
} }
fixupOutputHooks+=(wrapGAppsHook) fixupOutputHooks+=(wrapGAppsHook)