Fixing ttmkfdir, with help of a modification in deb-package.
svn path=/nixpkgs/trunk/; revision=15335
This commit is contained in:
parent
2dc368f084
commit
3e0708e505
|
@ -46,8 +46,9 @@ stdenv.mkDerivation rec {
|
||||||
name = localDefs.name + "deb";
|
name = localDefs.name + "deb";
|
||||||
builder = writeScript (name + "-builder")
|
builder = writeScript (name + "-builder")
|
||||||
(textClosure localDefs ([debPatch] ++
|
(textClosure localDefs ([debPatch] ++
|
||||||
(lib.optional (! (checkFlag "omitConfigure")) "doConfigure")
|
(lib.optional (patches != []) "doPatch") ++
|
||||||
++ [doInstall doForceShare]));
|
(lib.optional (! (checkFlag "omitConfigure")) "doConfigure") ++
|
||||||
|
[doInstall doForceShare]));
|
||||||
inherit meta;
|
inherit meta;
|
||||||
inherit src;
|
inherit src;
|
||||||
}
|
}
|
||||||
|
|
12
pkgs/tools/misc/ttmkfdir/cstring.patch
Normal file
12
pkgs/tools/misc/ttmkfdir/cstring.patch
Normal 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"
|
||||||
|
|
|
@ -5,11 +5,11 @@ debBuild ({
|
||||||
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
|
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
|
||||||
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
|
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
|
||||||
};
|
};
|
||||||
patch =
|
patch = fetchurl {
|
||||||
fetchurl {
|
|
||||||
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
|
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
|
||||||
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
|
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
|
||||||
};
|
};
|
||||||
|
patches = [ ./cstring.patch ];
|
||||||
name = "ttf-mkfontdir-3.0.9-5.1";
|
name = "ttf-mkfontdir-3.0.9-5.1";
|
||||||
buildInputs = [fontconfig freetype libunwind libtool
|
buildInputs = [fontconfig freetype libunwind libtool
|
||||||
flex bison];
|
flex bison];
|
||||||
|
|
Loading…
Reference in a new issue