From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QEhIIB6RAGAVbwAA0tVLHw (envelope-from ) for ; Thu, 14 Jan 2021 18:44:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KPrGGx6RAGCcVAAAbx9fmQ (envelope-from ) for ; Thu, 14 Jan 2021 18:44:46 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 05883940309 for ; Thu, 14 Jan 2021 18:44:46 +0000 (UTC) Received: from localhost ([::1]:37964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l07bw-0000bK-TI for larch@yhetil.org; Thu, 14 Jan 2021 13:44:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l07aJ-00086r-Dw for guix-patches@gnu.org; Thu, 14 Jan 2021 13:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l07aI-0003gT-Kv for guix-patches@gnu.org; Thu, 14 Jan 2021 13:43:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l07aI-0000qb-IY for guix-patches@gnu.org; Thu, 14 Jan 2021 13:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45870] [PATCH core-updates 2/3] gnu: texlive-amsfonts: Adjust to build with texlive-updmap.cfg. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Jan 2021 18:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45870@debbugs.gnu.org Received: via spool by 45870-submit@debbugs.gnu.org id=B45870.16106497353192 (code B ref 45870); Thu, 14 Jan 2021 18:43:02 +0000 Received: (at 45870) by debbugs.gnu.org; 14 Jan 2021 18:42:15 +0000 Received: from localhost ([127.0.0.1]:39191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l07ZX-0000pQ-Bg for submit@debbugs.gnu.org; Thu, 14 Jan 2021 13:42:15 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:37535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l07ZU-0000pC-M2 for 45870@debbugs.gnu.org; Thu, 14 Jan 2021 13:42:13 -0500 Received: by mail-qt1-f178.google.com with SMTP id v3so1981552qtw.4 for <45870@debbugs.gnu.org>; Thu, 14 Jan 2021 10:42:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aOjv+66IYDdicBT8kUdoux92UE5lJE7odINfEdgo/RE=; b=lhgyWma28VnVN3HTSj+/yrYJXLH9vrwpPsT9J9sbIYDsq1mufgvEkfLddN2ntRY0St phO3d256nGSDpQJWQgpgQGmpN98x3k/S9Erh0v8b27D7kNvjjTm1ayB7xD3vqTbmh+bl XhA9rokf9XAE/Ux2FPu1XO9T3otXfpA3XNkuXpIxkKeH1Nq9BNJXRBEcUh5HVAXfRgAn TYqTdBppXDTlM8/josUaJN+7f8nwQinjE+br28+HA8OqfCohtyOa+MSApK2n8p+Dok5Z 5Xv7iBTLyVHXL8ue0sMLEUWSiK01us3lnOQPI6wcp0TS/G36jqu+Cx5ulAKiD5RQHcbr MVZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aOjv+66IYDdicBT8kUdoux92UE5lJE7odINfEdgo/RE=; b=qYRTnqBDlNIYrmi9lzzwFlC2uczJJ11VjusLqUAor0JpprFwCeZJbq0/05btIh2I7B j47q3GMxtNfWhjuS101PNOp+rovtKE2k8xe2WOCXAaGvbKtw7lFw2B1ztvMZ+dFkdBuX AlpmpLlPi9TH6Nyz2EQqIVyBrrXLhFBZPW+1B3WYkhgJ1heswzxXGE26TroSCU59BaR3 MwSy/JYY8/rehxZe0/Lh4fxW3/T0hEHPr63DqP4a7vHB47XRzM8AOWMYhh/UjrkwRIy7 p/ygIae/M407asAB6cZn8LGaOER7mUdCZjSch9xklwZGNVbM6qbcHXOj9Z7lvFPeCv1d g5Lg== X-Gm-Message-State: AOAM531I5gHNe62g69wqiF92/edQTX/oIJNlQLw84viMxKcLiUQgi31m NR28O/FOsWJ7/GhxpiPhqYPJmvw+PFo= X-Google-Smtp-Source: ABdhPJxcC2AxvTCS1h7hwzXy6+uW6740pyeIkOkQzHyXRw1PLlEv1KOaAShA3E3zxwqTO9LebNGKvA== X-Received: by 2002:aed:2ec6:: with SMTP id k64mr8083565qtd.171.1610649726879; Thu, 14 Jan 2021 10:42:06 -0800 (PST) Received: from localhost.localdomain (dsl-157-252.b2b2c.ca. [66.158.157.252]) by smtp.gmail.com with ESMTPSA id 14sm3471917qkv.25.2021.01.14.10.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 10:42:05 -0800 (PST) From: Maxim Cournoyer Date: Thu, 14 Jan 2021 13:41:26 -0500 Message-Id: <20210114184127.16800-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210114184127.16800-1-maxim.cournoyer@gmail.com> References: <20210114184127.16800-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.74 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=lhgyWma2; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 05883940309 X-Spam-Score: 2.74 X-Migadu-Scanner: scn1.migadu.com X-TUID: 6s7lIdSFD6Gz * gnu/packages/tex.scm (texlive-amsfonts)[phases] {build-fonts}: Do not set SOURCE_DATE_EPOCH, already done by the build system. Let resources be auto-discovered by TeX Live machinery by simply setting GUIX_TEXMF. Remove references to the texlive-union input. Remove trailing #t. {install-generated-fonts}: Remove trailing #t. [native-inputs]: Replace texlive-union by texlive-updmap.cfg. Remove the texlive-cm and texlive-metafont arguments of texlive-updmap.cfg. --- gnu/packages/tex.scm | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index fb61a6c1ba..3d7aed30c7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1245,22 +1245,11 @@ Taco Hoekwater.") `(modify-phases ,phases (add-before 'build 'build-fonts (lambda* (#:key inputs #:allow-other-keys) - (let ((mf (assoc-ref inputs "texlive-union")) - (src (string-append (getcwd) "/fonts/source/public/amsfonts/"))) - ;; Make METAFONT reproducible - (setenv "SOURCE_DATE_EPOCH" "1") - ;; Tell mf where to find mf.base - (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) - ;; Tell mf where to look for source files - (setenv "MFINPUTS" - (string-append src ":" - src "/cmextra:" - src "/cyrillic:" - src "/dummy:" - src "/symbols:" - mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-cm") - "/share/texmf-dist/fonts/source/public/cm"))) + ;; Allow self fonts sources and other resources to be + ;; discovered. + (setenv "GUIX_TEXMF" (string-append (getenv "GUIX_TEXMF") + ":" (getcwd))) + (let ((build (string-append (getcwd) "/build-fonts"))) (mkdir-p build) (with-directory-excursion "fonts/source/public/amsfonts" @@ -1295,10 +1284,9 @@ Taco Hoekwater.") ;; eufm10.afm to eufm8.pl, and then generate the tfm file from ;; the pl file. (setenv "TEXINPUTS" - (string-append build "//:" + (string-append ":" build "//:" (getcwd) "/fonts/afm/public/amsfonts//:" - (getcwd) "/source/latex/amsfonts//:" - (assoc-ref inputs "texlive-union") "//")) + (getcwd) "/source/latex/amsfonts//:")) (with-directory-excursion build (for-each (match-lambda (((target-base target-size) @@ -1333,19 +1321,16 @@ Taco Hoekwater.") (("eurm6" 6) ("eurm7" 7)) (("eurm8" 8) ("eurm10" 10)) - (("eurm9" 9) ("eurm10" 10)))))) - #t)) + (("eurm9" 9) ("eurm10" 10)))))))) (add-after 'install 'install-generated-fonts (lambda* (#:key inputs outputs #:allow-other-keys) (copy-recursively "build-fonts" (string-append (assoc-ref outputs "out") - "/share/texmf-dist/fonts/tfm/public/amsfonts")) - #t)))))) + "/share/texmf-dist/fonts/tfm/public/amsfonts")))))))) (native-inputs - `(("texlive-union" ,(texlive-union (list texlive-tex-fontinst-base - texlive-cm - texlive-metafont))))) + `(("texlive-updmap.cfg" ,(texlive-updmap.cfg + (list texlive-fontinst))))) (home-page "https://www.ctan.org/pkg/amsfonts") (synopsis "TeX fonts from the American Mathematical Society") (description -- 2.29.2