From fe28b75fdd62e2387dfd2f3b00ce981c1f5b4832 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 Aug 2008 05:55:00 +0000
Subject: [PATCH] Updated fontdir to match builderDefs changes.

svn path=/nixos/trunk/; revision=12656
---
 system/fontdir.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index 42a1360cdb3..032785291ad 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-  let localDefs = builderDefs rec {
+args : with args; with builderDefs;
+  let localDefs = builderDefs.meta.function rec {
     src = "";/* put a fetchurl here */
 
     buildInputs = [mkfontdir mkfontscale ttmkfdir];
@@ -39,7 +39,7 @@ args : with args; with builderDefs {src="";} null;
     rm fonts.scale.old
     cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
   ") ["minInit" "addInputs"];
-  } null; /* null is a terminator for sumArgs */
+  };
   in with localDefs;
 stdenv.mkDerivation rec {
   name = "X11-fonts";