nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

libreoffice: wrapper: apparently session bus for DBus is enough, and adding a local system bus when a session bus is present makes things worse

Browse Source
This commit is contained in:
Michael Raskin 2018-04-15 08:33:10 +02:00
parent d72710880c
commit e471376982
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/libreoffice/wrapper.sh
View File

@ -3,21 +3,12 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}"
export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
if uname | grep Linux > /dev/null && if uname | grep Linux > /dev/null &&
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" && ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
mkdir "$dbus_tmp_dir" mkdir "$dbus_tmp_dir"
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
cat "@dbus@/share/dbus-1/system.conf" | "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 &
grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf" export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 &
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi
if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 &
export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system"
fi
fi fi
"@libreoffice@/bin/$(basename "$0")" "$@" "@libreoffice@/bin/$(basename "$0")" "$@"