diff options
author | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
commit | abcf4858cda9ded59671681ab9820b5358d8bb16 (patch) | |
tree | fd1b0a53affad3ad0eb9b3867a2c127228530973 /gnu/packages/fonts.scm | |
parent | 82adf4952ac1c03af3b41851ef4bbe1d2d6935a0 (diff) | |
parent | bfb48f4f33583f58392a05f1d6cbf559156293ed (diff) | |
download | guix-abcf4858cda9ded59671681ab9820b5358d8bb16.tar guix-abcf4858cda9ded59671681ab9820b5358d8bb16.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/fonts.scm')
-rw-r--r-- | gnu/packages/fonts.scm | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index e28598d421..22857e84b5 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -704,18 +704,11 @@ symbols unable to be displayed properly.") (package (name "font-un") (version "1.0.2-080608") - ;; The upstream server at kldp.net is serving us broken MIME. - ;; See <http://bugs.gnu.org/22908>. (source (origin (method url-fetch) - (uri (list - (string-append - "http://krosos.sdf.org/static/unix/" - "un-fonts-core-" version ".tar.gz") - ;; XXX: The upstream server at kldp.net - (string-append - "https://kldp.net/projects/unfonts/download/4695?filename=" - "un-fonts-core-" version ".tar.gz"))) + (uri (string-append + "https://kldp.net/unfonts/release/2607-" + "un-fonts-core-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 @@ -838,22 +831,15 @@ glyph designs, not just an added slant.") "unzip") "/bin")) (font-dir (string-append %output - "/share/fonts/truetype")) - (doc-dir (string-append %output "/share/doc/" - ,name "-" ,version))) + "/share/fonts/truetype"))) (setenv "PATH" PATH) (system* "unzip" (assoc-ref %build-inputs "source")) (mkdir-p font-dir) - (mkdir-p doc-dir) (for-each (lambda (ttf) (copy-file ttf (string-append font-dir "/" ttf))) - (find-files "." "\\.ttf$")) - (for-each (lambda (doc) - (copy-file doc - (string-append doc-dir "/" doc))) - (find-files "." "\\.txt$")))))) + (find-files "." "\\.ttf$")))))) (native-inputs `(("source" ,source) ("unzip" ,unzip))) |