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
9
envHooks+=(find_gio_modules)
10
11
wrapGAppsHook() {
12
-
[ -z "$dontWrapGApps" ] || return
13
-
dontWrapGApps=1 # guard against running multiple times (e.g. due to propagation)
14
15
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
16
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
···
33
gappsWrapperArgs+=(--prefix $v : "$dummy")
34
done
35
36
-
for i in $prefix/bin/* $prefix/libexec/*; do
37
-
echo "Wrapping app $i"
38
-
wrapProgram "$i" "${gappsWrapperArgs[@]}"
39
-
done
40
}
41
42
fixupOutputHooks+=(wrapGAppsHook)
···
8
9
envHooks+=(find_gio_modules)
10
11
+
# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
12
wrapGAppsHook() {
13
+
# guard against running multiple times (e.g. due to propagation)
14
+
[ -z "$wrapGAppsHookHasRun" ] || return
15
+
wrapGAppsHookHasRun=1
16
17
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
18
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
···
35
gappsWrapperArgs+=(--prefix $v : "$dummy")
36
done
37
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
44
}
45
46
fixupOutputHooks+=(wrapGAppsHook)