From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAJRf-0000Mb-3f for guix-patches@gnu.org; Mon, 15 May 2017 13:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAJRb-0002wQ-57 for guix-patches@gnu.org; Mon, 15 May 2017 13:06:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44146) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAJRa-0002wA-Oh for guix-patches@gnu.org; Mon, 15 May 2017 13:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAJRa-0003BK-DQ for guix-patches@gnu.org; Mon, 15 May 2017 13:06:02 -0400 Subject: bug#26924: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts Resent-Message-ID: From: Marius Bakke In-Reply-To: <1902e4ba-663b-bc0e-2860-b4011d172d99@openmailbox.org> References: <1902e4ba-663b-bc0e-2860-b4011d172d99@openmailbox.org> Date: Mon, 15 May 2017 19:05:00 +0200 Message-ID: <87zieedpab.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Brendan Tildesley , 26924@debbugs.gnu.org --=-=-= Content-Type: text/plain Brendan Tildesley writes: > From 8840dc34801e3717831fce82fe525b7a36b15f2f Mon Sep 17 00:00:00 2001 > From: Brendan Tildesley > Date: Sun, 14 May 2017 16:36:13 +1000 > Subject: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts > > *gnu/packages/ebook.scm (calibre): Delete liberation .ttf files > [arguments]: Calibre still references the bundled fonts, so we install the > packaged fonts to the directory the bundled fonts would have been. This should mention the new [input], but I think it should also be a [native-input] since it's just extracted and thrown away. [...] > @@ -144,7 +147,16 @@ > (substitute* "setup/build_environment.py" > (("sys.prefix") (string-append "'" pyqt "'"))) > (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) > - (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))))) > + (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))))) > + (add-after 'install 'install-font-liberation > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (for-each (lambda (file) > + (install-file file (string-append > + (assoc-ref outputs "out") > + "/share/calibre/fonts/liberation"))) > + (find-files (string-append > + (assoc-ref inputs "font-liberation") > + "/share/fonts/truetype")))))))) Again, minor nitpicking: This phase should also end with a #t after (for-each ...) since the return value is unspecified. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkZ37wACgkQoqBt8qM6 VPqoMQgAmbf2CdsI84tZjW9bQjCAJjqNsL+Na15AHhe29sATfbhbBxdW7FpSEovR IGejxG5u29xgdVhhHoZmNu4XAoIqCKaYDYcuM3Or4qvKtCWw79f7vACCjU1Dmwif MNKB0FZHc2YjGsMccgPIM6nfSf4mqBXxGAcQaBFTNP9vymWA0z/U352GD0XRI7Hi qrAKCL1TNupCxzqwTv3Stg30SByyVLByqb0fIzo5Lr4NhHNFU8kWlqcJ8CbJs8EN bW/oFMp5bJJISVSBZN6k/jhQCurVX6xL7Yjcld20wUOwWDy47E9XWP5KViP6ZrL/ UU2HmmxNDJXgTAxstwvdDtK9A31bgg== =gsyZ -----END PGP SIGNATURE----- --=-=-=--