aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-03-27 22:13:39 +0200
committerEfraim Flashner <efraim@flashner.co.il>2019-03-27 22:25:16 +0200
commit1f07550c86e6d9acbe49bbf15decc94e87339a95 (patch)
tree10d61e454db89ffe4e087808683ff0751d5c30cd /gnu
parentc2426dbddc060e364c2c67eae2b40b2a11ad286b (diff)
downloadguix-1f07550c86e6d9acbe49bbf15decc94e87339a95.tar.gz
guix-1f07550c86e6d9acbe49bbf15decc94e87339a95.zip
gnu: font-tamzen: Don't use unstable tarball.
* gnu/packages/fonts.scm (font-tamzen)[source]: Download using git-fetch. [native-inputs]: Remove gzip, tar. [arguments]: Adjust build accordingly.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/fonts.scm34
1 files changed, 12 insertions, 22 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 47a3c6c44d..ce26abca79 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -987,13 +987,14 @@ vector graphics.")
(version "1.11.4")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/sunaku/tamzen-font/archive/"
- "Tamzen-" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sunaku/tamzen-font.git")
+ (commit (string-append "Tamzen-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1ryd7gp6qiwaqw73jqbmh4kwlriyd8xykh4j7z90z8xp9fm7lrys"))))
+ "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@@ -1001,30 +1002,19 @@ vector graphics.")
(begin
(use-modules (guix build utils))
- (let ((tar (string-append (assoc-ref %build-inputs "tar")
- "/bin/tar"))
- (PATH (string-append (assoc-ref %build-inputs "gzip")
- "/bin"))
- (font-dir (string-append %output "/share/fonts/misc"))
- (psf-dir (string-append %output "/share/kbd/consolefonts"))
- (src-pcf-dir (string-append "tamzen-font-Tamzen-"
- ,version "/pcf")))
- (setenv "PATH" PATH)
- (invoke tar "xvf" (assoc-ref %build-inputs "source"))
+ (let* ((out (assoc-ref %outputs "out"))
+ (font-dir (string-append out "/share/fonts/misc"))
+ (psf-dir (string-append out "/share/kbd/consolefonts")))
+ (chdir (assoc-ref %build-inputs "source"))
(mkdir-p font-dir)
(mkdir-p psf-dir)
- (chdir src-pcf-dir)
(for-each (lambda (pcf)
(install-file pcf font-dir))
- (find-files "." "\\.pcf$"))
- (chdir "../psf")
+ (find-files "pcf" "\\.pcf$"))
(for-each (lambda (psf)
(install-file psf psf-dir))
- (find-files "." "\\.psf$"))
+ (find-files "psf" "\\.psf$"))
#t))))
- (native-inputs
- `(("tar" ,tar)
- ("gzip" ,gzip)))
(home-page "https://github.com/sunaku/tamzen-font")
(synopsis "Monospaced bitmap font for console and X11")
(description