pyrox.dev
lol
wrapGAppsHook: fix $gappsWrapperArgs as intended
i.e. define it even if $dontWrapGApps is set, and document the intention.
+10
-6
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+10
-6
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
···
8
8
9
9
envHooks+=(find_gio_modules)
10
10
11
+
# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
11
12
wrapGAppsHook() {
12
-
[ -z "$dontWrapGApps" ] || return
13
-
dontWrapGApps=1 # guard against running multiple times (e.g. due to propagation)
13
+
# guard against running multiple times (e.g. due to propagation)
14
+
[ -z "$wrapGAppsHookHasRun" ] || return
15
+
wrapGAppsHookHasRun=1
14
16
15
17
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
16
18
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
···
33
35
gappsWrapperArgs+=(--prefix $v : "$dummy")
34
36
done
35
37
36
-
for i in $prefix/bin/* $prefix/libexec/*; do
37
-
echo "Wrapping app $i"
38
-
wrapProgram "$i" "${gappsWrapperArgs[@]}"
39
-
done
38
+
if [ -z "$dontWrapGApps" ]; then
39
+
for i in $prefix/bin/* $prefix/libexec/*; do
40
+
echo "Wrapping app $i"
41
+
wrapProgram "$i" "${gappsWrapperArgs[@]}"
42
+
done
43
+
fi
40
44
}
41
45
42
46
fixupOutputHooks+=(wrapGAppsHook)