Updated fontdir to match builderDefs changes.

svn path=/nixos/trunk/; revision=12656
This commit is contained in:
Michael Raskin 2008-08-19 05:55:00 +00:00
parent 545406b2e2
commit fe28b75fdd

View File

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