From c77c3ab22c578e4a7d3f1a94cb76588fa5a7e745 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 11 Nov 2010 13:24:37 +0000
Subject: [PATCH] Remove ttmkfdir reference

svn path=/nixos/trunk/; revision=24662
---
 modules/config/fonts.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 8b7ba6fab948..bb75a1e29abd 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -98,7 +98,7 @@ in
 
 ###### implementation
 let
-  inherit (pkgs) builderDefs ttmkfdir;
+  inherit (pkgs) builderDefs;
   inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
 
   fontDirs = config.fonts.fonts;
@@ -107,7 +107,7 @@ let
   localDefs = with builderDefs; builderDefs.passthru.function rec {
     src = "";/* put a fetchurl here */
 
-    buildInputs = [mkfontdir mkfontscale ttmkfdir];
+    buildInputs = [mkfontdir mkfontscale];
     configureFlags = [];
     inherit fontDirs;
     installPhase = fullDepEntry ("
@@ -135,13 +135,6 @@ let
     rm fonts.alias
     mkfontdir
     mkfontscale
-    mv fonts.scale fonts.scale.old
-    mv fonts.dir fonts.dir.old
-    ttmkfdir
-    cat fonts.scale.old >> fonts.scale
-    cat fonts.dir.old >> fonts.dir
-    rm fonts.dir.old
-    rm fonts.scale.old
     cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
   ") ["minInit" "addInputs"];
   };