From 3e0708e505b46b8d279113b2227ace599b7eac62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Apr 2009 12:04:11 +0000 Subject: [PATCH] Fixing ttmkfdir, with help of a modification in deb-package. svn path=/nixpkgs/trunk/; revision=15335 --- pkgs/build-support/deb-package/default.nix | 5 +++-- pkgs/tools/misc/ttmkfdir/cstring.patch | 12 ++++++++++++ pkgs/tools/misc/ttmkfdir/default.nix | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/misc/ttmkfdir/cstring.patch diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix index 96b1a9aac45..4dc53ff0832 100644 --- a/pkgs/build-support/deb-package/default.nix +++ b/pkgs/build-support/deb-package/default.nix @@ -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; } diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/pkgs/tools/misc/ttmkfdir/cstring.patch new file mode 100644 index 00000000000..84f2621eaaa --- /dev/null +++ b/pkgs/tools/misc/ttmkfdir/cstring.patch @@ -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 + #include + #include ++#include + + #include "directory.h" + diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 7daa3db515b..6f90ca8eb0d 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -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];