dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #152954 from hqurve/libre-deps

Browse Source 
libreoffice: fix #152506 - add explicit dependencies on grep and coreutils to wrapper
This commit is contained in:
7c6f434c 2022-10-22 12:35:30 +00:00 committed by GitHub
commit 598f7de7bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/office/libreoffice/wrapper.nix
View File

@ -1,10 +1,11 @@
{ 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"

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

@ -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; }