From d5f344c987c8cc7b597e938c22e02edf1c4335f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Feb 2020 05:19:27 +0100 Subject: =?UTF-8?q?gnu:=20libreoffice:=20Fix=20=E2=80=98soffice=E2=80=99?= =?UTF-8?q?=20in=20a=20pure=20environment.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Refer to grep and coreutils by absolute file name in the soffice launcher script. --- gnu/packages/libreoffice.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 04477e2082..b2f18984ad 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1034,6 +1034,14 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "sh"))) + ;; Use store references for strictly necessary commands, + ;; but not for optional tools like ‘gdb’ and ‘valgrind’. + (for-each (lambda (command) + (substitute* "desktop/scripts/soffice.sh" + (((format #f"~a " command)) + (format #f "~a " (which command))))) + (list "dirname" "grep" "uname")) + ;; GPGME++ headers are installed in a gpgme++ subdirectory, but ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; find them on the include path without a prefix. -- cgit v1.2.3