pyrox.dev
lol
wrapGAppsHook: avoid running multiple times
/cc #10351 and @lethalman.
+7
-6
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+7
-6
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
···
9
9
envHooks+=(find_gio_modules)
10
10
11
11
wrapGAppsHook() {
12
+
[ -z "$dontWrapGApps" ] || return
13
+
dontWrapGApps=1 # guard against running multiple times (e.g. due to propagation)
14
+
12
15
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
13
16
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
14
17
fi
···
30
33
gappsWrapperArgs+=(--prefix $v : "$dummy")
31
34
done
32
35
33
-
if [ -z "$dontWrapGApps" ]; then
34
-
for i in $prefix/bin/* $prefix/libexec/*; do
35
-
echo "Wrapping app $i"
36
-
wrapProgram "$i" "${gappsWrapperArgs[@]}"
37
-
done
38
-
fi
36
+
for i in $prefix/bin/* $prefix/libexec/*; do
37
+
echo "Wrapping app $i"
38
+
wrapProgram "$i" "${gappsWrapperArgs[@]}"
39
+
done
39
40
}
40
41
41
42
fixupOutputHooks+=(wrapGAppsHook)