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

2 files changed, 13 insertions, 40 deletions

diff --git a/pkgs/data/fonts/kochi-mincho/default.nix b/pkgs/data/fonts/kochi-mincho/default.nix
deleted file mode 100644
index 2f31b85220b..00000000000
--- a/pkgs/data/fonts/kochi-mincho/default.nix
+++ /dev/null
@@ -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 ];
-  };
-}
diff --git a/pkgs/data/fonts/kochi-gothic/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index 9c36da36bf6..eceebf52912 100644
--- a/pkgs/data/fonts/kochi-gothic/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -3,30 +3,38 @@
 let version = "20030809";
 in
 stdenv.mkDerivation {
-  name = "kochi-gothic-${version}";
+  name = "kochi-substitute-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";
     sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea";
   };
 
+  src2 = 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-gothic-subst.ttf
+    dpkg-deb --fsys-tarfile $src2 | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
   '';
 
   installPhase = ''
     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-mincho-subst.ttf $out/share/fonts/truetype/
   '';
 
   meta = {
-    description = "Japanese font, a free replacement for MS Gothic.";
+    description = "Japanese font, a free replacement for MS Gothic and MS Mincho.";
     longDescription = ''
-      Kochi Gothic was developed as a free replacement for the MS Gothic 
-      font from Microsoft. This is the Debian version of Kochi Gothic, which
-      removes some non-free glyphs that were added from the naga10 font.
+      Kochi Gothic was developed as a free replacement for the MS Gothic and
+      MS Mincho fonts from Microsoft. These are the Debian versions of the
+      fonts, which remove some non-free glyphs that were added from the naga10
+      font.
     '';
     homepage = http://sourceforge.jp/projects/efont/;
     license = stdenv.lib.licenses.wadalab;