* Remove an unused file.

svn path=/nixpkgs/trunk/; revision=18810

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)
-
+}

pkgs/tools/misc/ttmkfdir/normal-builder.nix

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

pkgs/top-level/all-packages.nix

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