public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove an unused file.

Browse Source 
svn path=/nixpkgs/trunk/; revision=18810
This commit is contained in:
Eelco Dolstra 2009-12-04 15:42:27 +00:00
parent c726012afe
commit 20845cabfc
3 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/tools/misc/ttmkfdir/default.nix
View File

@ -1,24 +1,31 @@
args: with args; with debPackage; { stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
debBuild ({
src = stdenv.mkDerivation {
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 ];
name = "ttf-mkfontdir-3.0.9-5.1"; 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 = { meta = {
description = "Create fonts.dir for TTF font directory."; description = "Create fonts.dir for TTF font directory.";
}; };
extraReplacements = ''sed -e 's/int isatty(int [^)]*)/& throw()/' ''; }
omitConfigure = true;
} // args)

29
pkgs/tools/misc/ttmkfdir/normal-builder.nix
View File

@ -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.";
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -1558,13 +1558,7 @@ let
wxGUI = getConfig [ "truecrypt" "wxGUI" ] true; wxGUI = getConfig [ "truecrypt" "wxGUI" ] true;
}; };
/* don't have time to fix the builderDefs based expression ttmkfdir = import ../tools/misc/ttmkfdir {
ttmkfdirX = import ../tools/misc/ttmkfdir {
inherit debPackage freetype fontconfig libunwind libtool bison;
flex = flex2534;
};
*/
ttmkfdir = import ../tools/misc/ttmkfdir/normal-builder.nix {
inherit stdenv fetchurl freetype fontconfig libunwind libtool bison; inherit stdenv fetchurl freetype fontconfig libunwind libtool bison;
flex = flex2534; flex = flex2534;
}; };