From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: [PATCH] Fix gtk-doc build Date: Wed, 24 Feb 2016 15:32:52 +0100 Message-ID: <87a8mqfaaz.fsf@pobox.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYaV2-0006Np-Az for guix-devel@gnu.org; Wed, 24 Feb 2016 09:33:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYaUy-0000oy-32 for guix-devel@gnu.org; Wed, 24 Feb 2016 09:33:08 -0500 Received: from pb-sasl0.int.icgroup.com ([208.72.237.25]:52819 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYaUx-0000oo-UV for guix-devel@gnu.org; Wed, 24 Feb 2016 09:33:04 -0500 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-sasl0.pobox.com (Postfix) with ESMTP id 97CDD3E8F4 for ; Wed, 24 Feb 2016 09:33:01 -0500 (EST) Received: from pb-sasl0.int.icgroup.com (unknown [127.0.0.1]) by pb-sasl0.pobox.com (Postfix) with ESMTP id 7DCF93E8F2 for ; Wed, 24 Feb 2016 09:33:01 -0500 (EST) Received: from clucks (unknown [88.160.190.192]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pb-sasl0.pobox.com (Postfix) with ESMTPSA id 1D2B53E8F1 for ; Wed, 24 Feb 2016 09:32:59 -0500 (EST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain On media-updates, I had a failure building gtk-doc. Not sure what is causing this failure; was it always failing recently? Strange stuff. --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=0001-gnu-gtk-doc-Fix-build.patch >From 8c9f2582199ad1321f564ed10937457facc9453c Mon Sep 17 00:00:00 2001 From: Andy Wingo 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 --=-=-=--