summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaghav Gururajan <raghavgururajan@disroot.org>2020-04-19 01:18:41 -0400
committerGuix Patches Tester <>2020-04-19 06:27:06 +0100
commit2140a13db8ec02601b86f4a1fdb4c4e92a7109bf (patch)
treec9a2c97d603be08c4cf1652057d3e6ba701751fc
parentde5200ada9932501dbe010990ed1acf7688846a6 (diff)
downloadguix-patches-2140a13db8ec02601b86f4a1fdb4c4e92a7109bf.tar
guix-patches-2140a13db8ec02601b86f4a1fdb4c4e92a7109bf.tar.gz
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.
-rw-r--r--gnu/packages/fonts.scm14
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index dbc0c4f9d6..abc31f9623 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -662,9 +662,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
@@ -677,11 +675,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)