guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

13/15: gnu: libreoffice: Fix ‘soffice’ in a pure environment.


From: guix-commits
Subject: 13/15: gnu: libreoffice: Fix ‘soffice’ in a pure environment.
Date: Fri, 21 Feb 2020 12:39:46 -0500 (EST)

nckx pushed a commit to branch master
in repository guix.

commit d5f344c987c8cc7b597e938c22e02edf1c4335f3
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Fri Feb 21 05:19:27 2020 +0100

    gnu: libreoffice: Fix ‘soffice’ in a pure environment.
    
    * 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 04477e2..b2f1898 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]