From: Andy Wingo <wingo@igalia.com>
To: guix-devel@gnu.org
Subject: [PATCH] Fix gtk-doc build
Date: Wed, 24 Feb 2016 15:32:52 +0100 [thread overview]
Message-ID: <87a8mqfaaz.fsf@pobox.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 141 bytes --]
On media-updates, I had a failure building gtk-doc. Not sure what is
causing this failure; was it always failing recently? Strange stuff.
[-- Attachment #2: 0001-gnu-gtk-doc-Fix-build.patch --]
[-- Type: text/plain, Size: 1850 bytes --]
From 8c9f2582199ad1321f564ed10937457facc9453c Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Wed, 24 Feb 2016 15:31:15 +0100
Subject: [PATCH] gnu: gtk-doc: Fix build.
* gnu/packages/gtk.scm (gtk-doc): Fix build.
---
gnu/packages/gtk.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a234b89..9f2e514 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1107,7 +1107,24 @@ information.")
"12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before
+ 'configure 'fix-docbook
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "configure"
+ ;; The configure check is overzealous about making sure that
+ ;; things are in place -- it uses the xmlcatalog tool to make
+ ;; sure that docbook-xsl is available, but this tool can only
+ ;; look in one catalog file, unlike the $XML_CATALOG_FILES
+ ;; variable that Guix defines. Fool the test by using the
+ ;; docbook-xsl catalog explicitly and get on with life.
+ (("\"\\$XML_CATALOG_FILE\" \
+\"http://docbook.sourceforge.net/release/xsl/")
+ (string-append (assoc-ref %build-inputs "docbook-xsl")
+ "/xml/xsl/docbook-xsl-1.78.1/catalog.xml \
+\"http://docbook.sourceforge.net/release/xsl/"))))))
+ #:configure-flags
(list (string-append "--with-xml-catalog="
(assoc-ref %build-inputs "docbook-xml")
"/xml/dtd/docbook/catalog.xml"))))
--
2.6.3
next reply other threads:[~2016-02-24 14:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 14:32 Andy Wingo [this message]
2016-02-25 18:19 ` [PATCH] Fix gtk-doc build Ludovic Courtès
2016-02-25 20:37 ` Mark H Weaver
2016-02-26 10:55 ` Andy Wingo
2016-02-26 11:00 ` Andy Wingo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a8mqfaaz.fsf@pobox.com \
--to=wingo@igalia.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.