From d10b9108f2b6b3c7e02234e6abe85ce29600cc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 9 Nov 2015 15:38:26 +0100
Subject: [PATCH] wrapGAppsHook: fix $gappsWrapperArgs as intended

i.e. define it even if $dontWrapGApps is set, and document the intention.
---
 .../build-support/setup-hooks/wrap-gapps-hook.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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