ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: font-adobe-source-han-sans: Don't use unstable tarball.

Browse source 
* gnu/packages/fonts.scm (font-adobe-source-han-sans)[source]: Download
using git-fetch.
[native-inputs]: Remove gzip, tar.
[arguments]: Adjust build accordingly.
This commit is contained in:
Efraim Flashner 2019-03-27 21:57:58 +02:00
parent 3d17dc5d8f
commit 8f4dccf75d
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/fonts.scm
View file

@ -384,14 +384,14 @@ (define-public font-adobe-source-han-sans
(name "font-adobe-source-han-sans") (name "font-adobe-source-han-sans")
(version "1.004") (version "1.004")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/adobe-fonts/source-han-sans/archive/" (url "https://github.com/adobe-fonts/source-han-sans.git")
version "R.tar.gz")) (commit (string-append version "R"))))
(file-name (string-append "source-han-sans-" version "R.tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ssx0fw90sy6mj8fv8fv4dgzszpqwbmwpjnlx16g4pvaqzdmybbz")))) "0zm884d8fp5gvirq324050kqv7am9khyqhs9kk4r4rr3jzn61jpk"))))
(outputs '("out" ; OpenType/CFF Collection (OTC), 121 MiB. (outputs '("out" ; OpenType/CFF Collection (OTC), 121 MiB.
"cn" "jp" "kr" "tw")) ; Region-specific Subset OpenType/CFF. "cn" "jp" "kr" "tw")) ; Region-specific Subset OpenType/CFF.
(build-system trivial-build-system) (build-system trivial-build-system)
@ -400,20 +400,12 @@ (define-public font-adobe-source-han-sans
#:builder #:builder
(begin (begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(let ((tar (string-append (assoc-ref %build-inputs (let ((install-opentype-fonts
"tar")
"/bin/tar"))
(PATH (string-append (assoc-ref %build-inputs
"gzip")
"/bin"))
(install-opentype-fonts
(lambda (fonts-dir out) (lambda (fonts-dir out)
(copy-recursively fonts-dir (copy-recursively fonts-dir
(string-append (assoc-ref %outputs out) (string-append (assoc-ref %outputs out)
"/share/fonts/opentype"))))) "/share/fonts/opentype")))))
(setenv "PATH" PATH) (chdir (assoc-ref %build-inputs "source"))
(invoke tar "xvf" (assoc-ref %build-inputs "source"))
(chdir (string-append "source-han-sans-" ,version "R"))
(install-opentype-fonts "OTC" "out") (install-opentype-fonts "OTC" "out")
(install-opentype-fonts "SubsetOTF/CN" "cn") (install-opentype-fonts "SubsetOTF/CN" "cn")
(install-opentype-fonts "SubsetOTF/JP" "jp") (install-opentype-fonts "SubsetOTF/JP" "jp")
@ -421,9 +413,6 @@ (define-public font-adobe-source-han-sans
(install-opentype-fonts "SubsetOTF/TW" "tw") (install-opentype-fonts "SubsetOTF/TW" "tw")
(for-each delete-file (find-files %output "\\.zip$")) (for-each delete-file (find-files %output "\\.zip$"))
#t)))) #t))))
(native-inputs
`(("gzip" ,gzip)
("tar" ,tar)))
(home-page "https://github.com/adobe-fonts/source-han-sans") (home-page "https://github.com/adobe-fonts/source-han-sans")
(synopsis "Pan-CJK fonts") (synopsis "Pan-CJK fonts")
(description (description