update ttf-mkfontdir

svn path=/nixpkgs/trunk/; revision=23134
wip/yesman
David Guibert 14 years ago
parent eab216c593
commit 284217c135
  1. 12
      pkgs/tools/misc/ttmkfdir/cstring.patch
  2. 6
      pkgs/tools/misc/ttmkfdir/default.nix

@ -1,15 +1,3 @@
diff --git a/directory.cpp b/directory.cpp
index 5f0d78a..b94cbe5 100644
--- a/directory.cpp
+++ b/directory.cpp
@@ -2,6 +2,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <cstring>
#include "directory.h"
diff --git a/Makefile b/Makefile
index e65b64c..52af5ed 100644
--- a/Makefile

@ -1,7 +1,7 @@
{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
stdenv.mkDerivation {
name = "ttf-mkfontdir-3.0.9-5.1";
name = "ttf-mkfontdir-3.0.9-6";
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
@ -12,8 +12,8 @@ stdenv.mkDerivation {
# who knows more about C/C++ ..
patches =
[ (fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz;
sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633";
})
./cstring.patch # also fixes some other compilation issues (freetype includes)

Loading…
Cancel
Save