Merge branch 'master' into lprndn_Nixpkgs

2 files changed, 25 insertions, 0 deletions

diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 90d17ba52818..ca636420854a 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
     description = "A font editor";
     homepage = http://fontforge.github.io;
     platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
   };
 }
 
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
new file mode 100644
index 000000000000..046c1d449201
--- /dev/null
+++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
@@ -0,0 +1,24 @@
+{stdenv, fontforge, zlib}:
+stdenv.mkDerivation rec {
+  name = "fontforge-fonttools-${fontforge.version}";
+  src = fontforge.src;
+
+  buildInputs = [zlib];
+
+  setSourceRoot = ''export sourceRoot="$(echo */contrib/fonttools)"'';
+
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/doc/fontforge-fonttools}
+    for i in *.c; do
+      gcc "$i" -lz -lm --std=c99 -o "$out"/bin/$(basename "$i" .c)
+    done
+    cp README* "$out/share/doc/fontforge-fonttools"
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''Small font tools shipped in FontForge contrib'';
+    license = fontforge.meta.license;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; unix;
+  };
+}