BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wrapGAppsHook: Fix #78803

Browse source 
Add to gappsWrapperArgs in preFixupPhases.
This commit is contained in:
worldofpeace 2020-03-01 18:14:36 -05:00
parent 3973a3c79c
commit 29fc27b4ac
1 changed files with 66 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
View file

@ -9,6 +9,37 @@ find_gio_modules() {
addEnvHooks "${targetOffset:?}" find_gio_modules addEnvHooks "${targetOffset:?}" find_gio_modules
gappsWrapperArgsHook() {
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
fi
if [ -n "$XDG_ICON_DIRS" ]; then
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS")
fi
if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
fi
# Check for prefix as well
if [ -d "${prefix:?}/share" ]; then
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
fi
if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ]; then
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
fi
for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
if [ -n "${!v}" ]; then
gappsWrapperArgs+=(--prefix "$v" : "${!v}")
fi
done
}
preFixupPhases+=" gappsWrapperArgsHook"
wrapGApp() { wrapGApp() {
local program="$1" local program="$1"
shift 1 shift 1
@ -17,72 +48,46 @@ wrapGApp() {
# Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set. # Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set.
wrapGAppsHook() { wrapGAppsHook() {
# guard against running multiple times (e.g. due to propagation) # guard against running multiple times (e.g. due to propagation)
[ -z "$wrapGAppsHookHasRun" ] || return 0 [ -z "$wrapGAppsHookHasRun" ] || return 0
wrapGAppsHookHasRun=1 wrapGAppsHookHasRun=1
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then if [[ -z "${dontWrapGApps:-}" ]]; then
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") targetDirsThatExist=()
fi targetDirsRealPath=()
if [ -n "$XDG_ICON_DIRS" ]; then # wrap binaries
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS") targetDirs=("${prefix}/bin" "${prefix}/libexec")
fi for targetDir in "${targetDirs[@]}"; do
if [[ -d "${targetDir}" ]]; then
if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then targetDirsThatExist+=("${targetDir}")
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH") targetDirsRealPath+=("$(realpath "${targetDir}")/")
fi find "${targetDir}" -type f -executable -print0 |
while IFS= read -r -d '' file; do
if [ -d "${prefix:?}/share" ]; then echo "Wrapping program '${file}'"
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share") wrapGApp "${file}"
fi done
fi
if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
fi
for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
if [ -n "${!v}" ]; then
gappsWrapperArgs+=(--prefix "$v" : "${!v}")
fi
done
if [[ -z "${dontWrapGApps:-}" ]]; then
targetDirsThatExist=()
targetDirsRealPath=()
# wrap binaries
targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
for targetDir in "${targetDirs[@]}"; do
if [[ -d "${targetDir}" ]]; then
targetDirsThatExist+=("${targetDir}")
targetDirsRealPath+=("$(realpath "${targetDir}")/")
find "${targetDir}" -type f -executable -print0 \
| while IFS= read -r -d '' file; do
echo "Wrapping program '${file}'"
wrapGApp "${file}"
done done
fi
done
# wrap links to binaries that point outside targetDirs # wrap links to binaries that point outside targetDirs
# Note: links to binaries within targetDirs do not need # Note: links to binaries within targetDirs do not need
# to be wrapped as the binaries have already been wrapped # to be wrapped as the binaries have already been wrapped
if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then
find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 \ find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 |
| while IFS= read -r -d '' linkPath; do while IFS= read -r -d '' linkPath; do
linkPathReal=$(realpath "${linkPath}") linkPathReal=$(realpath "${linkPath}")
for targetPath in "${targetDirsRealPath[@]}"; do for targetPath in "${targetDirsRealPath[@]}"; do
if [[ "$linkPathReal" == "$targetPath"* ]]; then if [[ "$linkPathReal" == "$targetPath"* ]]; then
echo "Not wrapping link: '$linkPath' (already wrapped)" echo "Not wrapping link: '$linkPath' (already wrapped)"
continue 2 continue 2
fi fi
done done
echo "Wrapping link: '$linkPath'" echo "Wrapping link: '$linkPath'"
wrapGApp "${linkPath}" wrapGApp "${linkPath}"
done done
fi
fi fi
fi
} }
fixupOutputHooks+=(wrapGAppsHook) fixupOutputHooks+=(wrapGAppsHook)