Merge pull request #4818 from vbgl/fonts

updates freefont_ttf and junicode
This commit is contained in:
cillianderoiste 2014-11-04 09:41:56 +01:00
commit ce1f834ef3
2 changed files with 11 additions and 10 deletions

View File

@ -1,13 +1,15 @@
{stdenv, fetchurl}: {stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freefont-ttf-20100919"; name = "freefont-ttf-20120503";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/freefont/${name}.tar.gz"; url = "mirror://gnu/freefont/${name}.zip";
sha256 = "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4"; sha256 = "1bw9mrf5pqi2a29b7qw4nhhj566aqqmi28hkbn2a38c2pzqvm1bw";
}; };
buildInputs = [ unzip ];
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype

View File

@ -1,24 +1,23 @@
{ stdenv, fetchurl, unzip }: { stdenv, fetchurl, unzip }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "junicode-0.6.15"; name = "junicode-0.7.8";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/junicode/junicode-0.6.15.zip; url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip;
sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns"; sha256 = "1lgkhj52s351ya7lp9z3xba7kaivgdvg80njhpj1rpc3jcmc69vl";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];
sourceRoot = ".";
installPhase = installPhase =
'' ''
mkdir -p $out/share/fonts/junicode-ttf mkdir -p $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf cp fonts/*.ttf $out/share/fonts/junicode-ttf
''; '';
meta = { meta = {
homepage = http://junicode.sourceforge.net/;
description = "A Unicode font"; description = "A Unicode font";
}; };
} }