From 1a30cf5e0926488b58b862a370a5e88461815c23 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Thu, 12 Jun 2014 21:33:23 -0600
Subject: [PATCH] Re-added the non-free kochi-substitute with naga10 glyphs.

---
 .../fonts/kochi-substitute-naga10/default.nix | 36 +++++++++++++++++++
 pkgs/data/fonts/kochi-substitute/default.nix  |  8 ++---
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/data/fonts/kochi-substitute-naga10/default.nix

diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix
new file mode 100644
index 000000000000..30a56f950f9a
--- /dev/null
+++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl }:
+
+let version = "20030809";
+in
+stdenv.mkDerivation {
+  name = "kochi-substitute-naga10-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";
+    sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c";
+  };
+
+  sourceRoot = "kochi-substitute-${version}";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf
+    cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf
+  '';
+
+  unfreeRedistributable = "unfree-redistributable";
+
+  meta = {
+    description = "Japanese font, non-free replacement for MS Gothic and MS Mincho.";
+    homepage = http://sourceforge.jp/projects/efont/;
+    longDescription = ''
+      Kochi Gothic and Kochi Mincho were developed as free replacements for the
+      MS Gothic and MS Mincho fonts from Microsoft. This version of the fonts
+      includes some non-free glyphs from the naga10 font, which stipulate that
+      this font may not be sold commercially. See kochi-substitute for the free
+      Debian version.
+    '';
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
+  };
+}
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index eceebf52912c..dec20fd51000 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -31,10 +31,10 @@ stdenv.mkDerivation {
   meta = {
     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 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.
+      Kochi Gothic and Kochi Mincho were developed as free replacements 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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3be9de80fc1a..e5d81472f338 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7791,6 +7791,8 @@ let
 
   kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
 
+  kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
+
   liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
 
   libertine = builderDefsPackage (import ../data/fonts/libertine) {