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

libreoffice: fix #152506 - add explicit dependencies on grep and coreutils to wrapper

Browse Source
This commit is contained in:
hqurve 2021-12-31 11:37:55 -04:00
parent 3f1e5d05de
commit 1e12026447
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ libreoffice, runCommand, dbus, bash }: { libreoffice, runCommand, coreutils, gnugrep, dbus, bash }:
let let
jdk = libreoffice.jdk; jdk = libreoffice.jdk;
in in
(runCommand libreoffice.name { (runCommand libreoffice.name {
inherit dbus libreoffice jdk bash; inherit coreutils dbus gnugrep libreoffice jdk bash;
} '' } ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
ln -s "${libreoffice}/share" "$out/share" ln -s "${libreoffice}/share" "$out/share"

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

@ -2,7 +2,7 @@
export JAVA_HOME="${JAVA_HOME:-@jdk@}" 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 "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null &&
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
if ! test -d "$dbus_tmp_dir" && test -d "/run"; then if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
@ -25,7 +25,7 @@ for PROFILE in $NIX_PROFILES; do
fi fi
done done
"@libreoffice@/bin/$(basename "$0")" "$@" "@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@"
code="$?" code="$?"
test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; } test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }