From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH 4/6] gnu: docbook-xsl write absolute file:// uris in catalogs instead of ./ relative ones Date: Tue, 15 Jul 2014 20:31:34 +0200 Message-ID: <1405449096-29230-4-git-send-email-jmd@gnu.org> References: <1405449096-29230-1-git-send-email-jmd@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X77WE-00008X-FJ for guix-devel@gnu.org; Tue, 15 Jul 2014 14:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X77W1-0003j5-GK for guix-devel@gnu.org; Tue, 15 Jul 2014 14:32:02 -0400 In-Reply-To: <1405449096-29230-1-git-send-email-jmd@gnu.org> 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 Cc: John Darrington * gnu/packages/docbook.scm (docbook-xsl): Replace ./ paths with file:// uris --- gnu/packages/docbook.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 431da7f..c689c9c 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -100,7 +100,7 @@ by no means limited to these applications.) This package provides XML DTDs.") "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9")))) (build-system trivial-build-system) (arguments - `(#:builder (begin + `(#:builder (let ((name-version (string-append ,name "-" ,version))) (use-modules (guix build utils)) (let* ((bzip2 (assoc-ref %build-inputs "bzip2")) @@ -112,10 +112,13 @@ by no means limited to these applications.) This package provides XML DTDs.") (system* (string-append tar "/bin/tar") "xvf" source) (mkdir-p xsl) - (copy-recursively (string-append ,name "-" ,version) - (string-append xsl "/" ,name - "-" ,version)))) - #:modules ((guix build utils)))) + (copy-recursively name-version + (string-append xsl "/" name-version)) + + (substitute* (string-append xsl "/" name-version "/catalog.xml") + (("rewritePrefix=\"./") + (string-append "rewritePrefix=\"file://" xsl "/" name-version "/"))))) + #:modules ((guix build utils)))) (native-inputs `(("bzip2" ,bzip2) ("tar" ,tar))) (home-page "http://docbook.org") -- 1.7.10.4