diff options
| author | David Guibert <david.guibert@gmail.com> | 2010-08-12 05:59:52 +0000 |
|---|---|---|
| committer | David Guibert <david.guibert@gmail.com> | 2010-08-12 05:59:52 +0000 |
| commit | 284217c135decb980694dd3876a4e30d89a72b10 (patch) | |
| tree | 1d94aebfbb1a4435663796aafdfb88cb0cabb6ad /pkgs/tools/misc/ttmkfdir | |
| parent | eab216c593bd6f6122366b861dae478413ddecd7 (diff) | |
| download | nixlib-284217c135decb980694dd3876a4e30d89a72b10.tar nixlib-284217c135decb980694dd3876a4e30d89a72b10.tar.gz nixlib-284217c135decb980694dd3876a4e30d89a72b10.tar.bz2 nixlib-284217c135decb980694dd3876a4e30d89a72b10.tar.lz nixlib-284217c135decb980694dd3876a4e30d89a72b10.tar.xz nixlib-284217c135decb980694dd3876a4e30d89a72b10.tar.zst nixlib-284217c135decb980694dd3876a4e30d89a72b10.zip | |
update ttf-mkfontdir
svn path=/nixpkgs/trunk/; revision=23134
Diffstat (limited to 'pkgs/tools/misc/ttmkfdir')
| -rw-r--r-- | pkgs/tools/misc/ttmkfdir/cstring.patch | 12 | ||||
| -rw-r--r-- | pkgs/tools/misc/ttmkfdir/default.nix | 6 |
2 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/pkgs/tools/misc/ttmkfdir/cstring.patch index 6b65b44e8518..e1da347c64f1 100644 --- a/pkgs/tools/misc/ttmkfdir/cstring.patch +++ b/pkgs/tools/misc/ttmkfdir/cstring.patch @@ -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 diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 1d633634e595..e4e8d3c3e9b5 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -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) |