Fixing ttmkfdir, with help of a modification in deb-package.

svn path=/nixpkgs/trunk/; revision=15335
This commit is contained in:
Lluís Batlle i Rossell 2009-04-27 12:04:11 +00:00
parent 2dc368f084
commit 3e0708e505
3 changed files with 17 additions and 4 deletions

View file

@ -46,8 +46,9 @@ stdenv.mkDerivation rec {
name = localDefs.name + "deb";
builder = writeScript (name + "-builder")
(textClosure localDefs ([debPatch] ++
(lib.optional (! (checkFlag "omitConfigure")) "doConfigure")
++ [doInstall doForceShare]));
(lib.optional (patches != []) "doPatch") ++
(lib.optional (! (checkFlag "omitConfigure")) "doConfigure") ++
[doInstall doForceShare]));
inherit meta;
inherit src;
}

View file

@ -0,0 +1,12 @@
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"

View file

@ -5,11 +5,11 @@ debBuild ({
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
};
patch =
fetchurl {
patch = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
};
patches = [ ./cstring.patch ];
name = "ttf-mkfontdir-3.0.9-5.1";
buildInputs = [fontconfig freetype libunwind libtool
flex bison];