[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: libreoffice: Fix xdg-open absolute paths.
From: |
guix-commits |
Subject: |
01/01: gnu: libreoffice: Fix xdg-open absolute paths. |
Date: |
Sun, 21 Jul 2019 19:48:36 -0400 (EDT) |
marusich pushed a commit to branch master
in repository guix.
commit afb986e77cd669c2f21953f501f7893237730ca7
Author: Chris Marusich <address@hidden>
Date: Mon Jul 15 22:42:07 2019 -0700
gnu: libreoffice: Fix xdg-open absolute paths.
Fixes: <https://bugs.gnu.org/36728>.
* gnu/packages/libreoffice.scm (libreoffice) [inputs]: Add xdg-utils.
[arguments][#:phases][prepare-src]: Replace hard-coded absolute paths to
xdg-open in the source with the path to xdg-open in the xdg-utils input.
---
gnu/packages/libreoffice.scm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 9f5bedd..026ce92 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2017 Rutger Helling <address@hidden>
;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Jonathan Brielmaier <address@hidden>
+;;; Copyright © 2019 Chris Marusich <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -53,6 +54,7 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@@ -1045,6 +1047,7 @@ converting QuarkXPress file format. It supports versions
3.1 to 4.1.")
("unixodbc" ,unixodbc)
("unzip" ,unzip)
("vigra" ,vigra)
+ ("xdg-utils" ,xdg-utils)
("xmlsec" ,xmlsec-nss)
("zip" ,zip)))
(arguments
@@ -1077,6 +1080,13 @@ converting QuarkXPress file format. It supports
versions 3.1 to 4.1.")
(assoc-ref inputs "gpgme")
"/include/gpgme++")))
+ ;; /usr/bin/xdg-open doesn't exist on Guix System.
+ (substitute* '("shell/source/unix/exec/shellexec.cxx"
+ "shell/source/unix/misc/senddoc.sh")
+ (("/usr/bin/xdg-open")
+ (string-append (assoc-ref inputs "xdg-utils")
+ "/bin/xdg-open")))
+
#t))
(add-after 'install 'bin-and-desktop-install
;; Create 'soffice' and 'libreoffice' symlinks to the executable