summaryrefslogtreecommitdiff
path: root/gnu/packages/libreoffice.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2018-09-28 23:30:55 -0400
committerLeo Famulari <leo@famulari.name>2018-10-02 14:46:13 -0400
commit994bccd9443032141accede0e403cbfb62f6c63e (patch)
tree01a57234cf4a596b39134e2f526866c045f5c49b /gnu/packages/libreoffice.scm
parentb0f43001195c69f730b49b0bf9de516edd53baed (diff)
downloadguix-patches-994bccd9443032141accede0e403cbfb62f6c63e.tar
guix-patches-994bccd9443032141accede0e403cbfb62f6c63e.tar.gz
gnu: LibreOffice: Fix "File > Open" crash on foreign distros.
Fixes <https://bugs.gnu.org/30642>. * gnu/packages/libreoffice.scm (libreoffice)[build-system]: Use glib-or-gtk-build-system. [arguments]: Set '#:out-of-source #f'.
Diffstat (limited to 'gnu/packages/libreoffice.scm')
-rw-r--r--gnu/packages/libreoffice.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 68b4e265f3..881cf2008d 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -28,6 +28,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libreoffice)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix download)
@@ -939,7 +940,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335"))
(patches (search-patches "libreoffice-icu.patch"
"libreoffice-glm.patch"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(native-inputs
`(("bison" ,bison)
("cppunit" ,cppunit-1.14)
@@ -1017,6 +1018,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(arguments
`(#:tests? #f ; Building the tests already fails.
#:make-flags '("build-nocheck") ; Do not build unit tests, which fails.
+ ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree
+ ;; builds by default.
+ #:out-of-source? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'prepare-src