Moved kochi-mincho and kochi-gothic back into one package.

This commit is contained in:
Jonathan Glines 2014-06-11 22:18:05 -06:00
parent b913409e0b
commit f5b5df830c
3 changed files with 14 additions and 43 deletions

View File

@ -1,35 +0,0 @@
{ stdenv, fetchurl, dpkg }:
let version = "20030809";
in
stdenv.mkDerivation {
name = "kochi-mincho-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb";
sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c";
};
buildInputs = [ dpkg ];
unpackCmd = ''
dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
'';
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/
'';
meta = {
description = "Japanese font, a free replacement for MS Mincho.";
longDescription = ''
Kochi Mincho was developed as a free replacement for the MS Mincho
font from Microsoft. This is the Debian version of Kochi Mincho, which
removes some non-free glyphs that were added from the naga10 font.
'';
homepage = http://sourceforge.jp/projects/efont/;
license = stdenv.lib.licenses.wadalab;
maintainers = [ stdenv.lib.maintainers.auntie ];
};
}

View File

@ -3,30 +3,38 @@
let version = "20030809"; let version = "20030809";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kochi-gothic-${version}"; name = "kochi-substitute-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";
sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea"; sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea";
}; };
src2 = fetchurl {
url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb";
sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c";
};
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
unpackCmd = '' unpackCmd = ''
dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf
dpkg-deb --fsys-tarfile $src2 | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype
cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/ cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/
cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/
''; '';
meta = { meta = {
description = "Japanese font, a free replacement for MS Gothic."; description = "Japanese font, a free replacement for MS Gothic and MS Mincho.";
longDescription = '' longDescription = ''
Kochi Gothic was developed as a free replacement for the MS Gothic Kochi Gothic was developed as a free replacement for the MS Gothic and
font from Microsoft. This is the Debian version of Kochi Gothic, which MS Mincho fonts from Microsoft. These are the Debian versions of the
removes some non-free glyphs that were added from the naga10 font. fonts, which remove some non-free glyphs that were added from the naga10
font.
''; '';
homepage = http://sourceforge.jp/projects/efont/; homepage = http://sourceforge.jp/projects/efont/;
license = stdenv.lib.licenses.wadalab; license = stdenv.lib.licenses.wadalab;

View File

@ -7789,9 +7789,7 @@ let
junicode = callPackage ../data/fonts/junicode { }; junicode = callPackage ../data/fonts/junicode { };
kochi-gothic = callPackage ../data/fonts/kochi-gothic {}; kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
kochi-mincho = callPackage ../data/fonts/kochi-mincho {};
liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };