Unverified Commit 598f7de7 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #152954 from hqurve/libre-deps 

libreoffice: fix #152506 - add explicit dependencies on grep and coreutils to wrapper
parents c1989c17 39dc530f

pkgs/applications/office/libreoffice/wrapper.nix

+2 −1
Original line number Diff line number Diff line 
{ lib, runCommand

, libreoffice, dbus, bash, substituteAll

, coreutils, gnugrep

, dolphinTemplates ? true

}:

runCommand libreoffice.name {

  inherit (libreoffice) jdk meta;

  inherit dbus libreoffice bash;

  inherit coreutils dbus gnugrep libreoffice bash;

} (''

  mkdir -p "$out/bin"

  substituteAll "${./wrapper.sh}" "$out/bin/soffice"

pkgs/applications/office/libreoffice/wrapper.sh

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
export JAVA_HOME="${JAVA_HOME:-@jdk@}"

#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"



if uname | grep Linux > /dev/null &&

if "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null &&

       ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then

    dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"

    if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
@@ -25,7 +25,7 @@ for PROFILE in $NIX_PROFILES; do 
    fi

done



"@libreoffice@/bin/$(basename "$0")" "$@"

"@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@"

code="$?"



test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }