From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:54903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004id-5b for guix-patches@gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbI9-0003zf-RP for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI4-0003w9-Gz for guix-patches@gnu.org; Fri, 03 May 2019 12:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI4-0007Gs-Di for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 Subject: [bug#35446] [PATCH v2 02/24] gnu: calibre: Use system mathjax. Resent-Message-ID: From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:10 +1000 Message-Id: <20190503164232.1799-2-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35446@debbugs.gnu.org * gnu/packages/ebook.scm (calibre): Use system mathjax. The build phase can be replaced because the install phase builds everything anyway. --- gnu/packages/ebook.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index a603519590..1d815489a6 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) @@ -113,6 +114,7 @@ ("fontconfig" ,fontconfig) ("glib" ,glib) ("icu4c" ,icu4c) + ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) @@ -181,6 +183,10 @@ (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) #t))) + (add-after 'build 'build-extra + (lambda* (#:key inputs #:allow-other-keys) + (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" + (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")))) (add-after 'install 'install-font-liberation (lambda* (#:key inputs outputs #:allow-other-keys) (for-each (lambda (file) -- 2.21.0