From patchwork Sun Apr 19 05:24:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21357 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2AFC927BBE4; Sun, 19 Apr 2020 06:26:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EE4B627BBE1 for ; Sun, 19 Apr 2020 06:26:16 +0100 (BST) Received: from localhost ([::1]:37522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ2T9-0000dN-Gj for patchwork@mira.cbaines.net; Sun, 19 Apr 2020 01:26:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34178) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ2Sx-0000d2-1E for guix-patches@gnu.org; Sun, 19 Apr 2020 01:26:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQ2Sw-0007Ff-Lu for guix-patches@gnu.org; Sun, 19 Apr 2020 01:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQ2Sw-0007DK-8r for guix-patches@gnu.org; Sun, 19 Apr 2020 01:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQ2Sw-00009U-2s for guix-patches@gnu.org; Sun, 19 Apr 2020 01:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40708] gnu: font-gnu-unifont: Unify outputs for fonts. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Apr 2020 05:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40708@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1587273904510 (code B ref -1); Sun, 19 Apr 2020 05:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Apr 2020 05:25:04 +0000 Received: from localhost ([127.0.0.1]:43955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQ2S0-00008A-4s for submit@debbugs.gnu.org; Sun, 19 Apr 2020 01:25:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:32933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQ2Ry-000082-8t for submit@debbugs.gnu.org; Sun, 19 Apr 2020 01:25:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33692) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ2Ru-0000Tg-4X for guix-patches@gnu.org; Sun, 19 Apr 2020 01:25:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQ2Rs-0002it-R8 for guix-patches@gnu.org; Sun, 19 Apr 2020 01:24:57 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52598) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jQ2Rr-0002Qg-PX for guix-patches@gnu.org; Sun, 19 Apr 2020 01:24:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 079C825237 for ; Sun, 19 Apr 2020 07:24:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m7zSddG54GX0 for ; Sun, 19 Apr 2020 07:24:52 +0200 (CEST) Date: Sun, 19 Apr 2020 01:24:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587273891; bh=vPvV2zXZ9Yr8GgzHQwLK73PAIIKrHFqm+Vx8eFnlpog=; h=Date:From:To:Subject; b=JPb/6KBu5rZXztrrpgcW4tGLz1YSs34SzO563ianR+VTtfNeKxF3bA1Vu1mW0Wutd lZ0nLXBF5LxGnGYWvX40LY3o+fCmAzGQRkNqcP9rfgKKAN/LKR9wviZZJXVxw8G7D8 x7TZpROn0PuXFHVw8ItvIAxfuWCKrwCCcP3p5TEBTR90RdNqBbS+sDy2AZkMG97d3F 2pDVZ31XJsiv8gNVfMi1jCxzHInejsNkIe16p1NfVwpuE3AoKfpnwQJmjo91EI7rAd +HMV+zAtvW6BxL0vs1JWAEqzxbVD+TaUsi6aMmP//fgksgzeMuxjezaTphJ3Cj+o4+ T8XvhziYi6Ajw== From: Raghav Gururajan Message-ID: <20200419012441.62891acb.raghavgururajan@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From dff7acc350ba6f2e8d6ba3b561fb58acdc1a9c00 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Apr 2020 01:18:41 -0400 Subject: [PATCH 2/2] gnu: font-gnu-unifont: Unify outputs for fonts. * gnu/package/fonts.scm (font-gnu-unifont): Unify outputs for fonts. Let us not over-do multiple outputs. Separating fonts and binaries is sane enough. Also, GNU Unifont only have very few fonts in each format. --- gnu/packages/fonts.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0356d50c7c..77103bdd39 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -681,9 +681,7 @@ for use at smaller text sizes"))) (sha256 (base32 "1svzm3xahb2m8r79ha9gb1z3zlckykx9d87cghswj7dxn9868j4b")))) (build-system gnu-build-system) - (outputs '("out" ; TrueType version - "pcf" ; PCF (bitmap) version - "psf" ; PSF (console) version + (outputs '("out" ; Fonts "bin")) ; Utilities to manipulate '.hex' format (arguments '(#:tests? #f ; no check target @@ -696,11 +694,11 @@ for use at smaller text sizes"))) 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((ttf (string-append (assoc-ref outputs "out") - "/share/fonts/truetype")) - (pcf (string-append (assoc-ref outputs "pcf") - "/share/fonts/misc")) - (psf (string-append (assoc-ref outputs "psf") - "/share/consolefonts")) + "/share/fonts/ttf")) + (pcf (string-append (assoc-ref outputs "out") + "/share/fonts/pcf")) + (psf (string-append (assoc-ref outputs "out") + "/share/fonts/psf")) (bin (assoc-ref outputs "bin"))) (invoke "make" (string-append "PREFIX=" bin) -- 2.26.1