diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-04 15:42:27 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-04 15:42:27 +0000 |
commit | 20845cabfc58d693c0a35b06e48febc2c3f794d9 (patch) | |
tree | e81273e8d696dcf14ab60848a04bdb4ca10012e2 /pkgs/tools/misc/ttmkfdir | |
parent | c726012afe1dbd13da7ab15381e3de2867bc8af5 (diff) |
* Remove an unused file.
svn path=/nixpkgs/trunk/; revision=18810
Diffstat (limited to 'pkgs/tools/misc/ttmkfdir')
-rw-r--r-- | pkgs/tools/misc/ttmkfdir/default.nix | 47 | ||||
-rw-r--r-- | pkgs/tools/misc/ttmkfdir/normal-builder.nix | 29 |
2 files changed, 27 insertions, 49 deletions
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 52b344e69bf90..1d633634e595a 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,24 +1,31 @@ -args: with args; with debPackage; -debBuild ({ - src = - fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; - sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; - }; - patch = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz; - sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4"; - }; - patches = [ - /* also fixes some other compilation issues (freetype includes) */ - ./cstring.patch ]; +{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: + +stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-5.1"; - buildInputs = [fontconfig freetype libunwind libtool - flex bison]; + + src = fetchurl { + url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; + sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; + }; + + # all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone + # 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"; + }) + + ./cstring.patch # also fixes some other compilation issues (freetype includes) + ]; + + preInstall = '' + ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin" + ''; + + buildInputs = [freetype fontconfig libunwind libtool flex bison]; + meta = { description = "Create fonts.dir for TTF font directory."; }; - extraReplacements = ''sed -e 's/int isatty(int [^)]*)/& throw()/' ''; - omitConfigure = true; -} // args) - +} diff --git a/pkgs/tools/misc/ttmkfdir/normal-builder.nix b/pkgs/tools/misc/ttmkfdir/normal-builder.nix deleted file mode 100644 index 122ea47e33b5d..0000000000000 --- a/pkgs/tools/misc/ttmkfdir/normal-builder.nix +++ /dev/null @@ -1,29 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "ttf-mkfontdir-3.0.9-5.1"; - - src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; - sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; - }; - # all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone - # 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"; - }) - - ./cstring.patch /* also fixes some other compilation issues (freetype includes) */ ]; - - preInstall = '' - ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin" - ''; - - buildInputs = [freetype fontconfig libunwind libtool flex bison]; - - meta = { - description = "Create fonts.dir for TTF font directory."; - }; -} |