Subject: gnu: font-gnu-unifont: Unify outputs for fonts.

From: Raghav Gururajan <[email-masked]>
Date: Sun, 19 Apr 2020 01:24:41 -0400

>From dff7acc350ba6f2e8d6ba3b561fb58acdc1a9c00 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
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