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

Remove ttmkfdir reference

Browse Source 
svn path=/nixos/trunk/; revision=24662
This commit is contained in:
Michael Raskin 2010-11-11 13:24:37 +00:00
parent 30943d2dc0
commit c77c3ab22c
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/config/fonts.nix
View File

@ -98,7 +98,7 @@ in
###### implementation ###### implementation
let let
inherit (pkgs) builderDefs ttmkfdir; inherit (pkgs) builderDefs;
inherit (pkgs.xorg) mkfontdir mkfontscale fontalias; inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
fontDirs = config.fonts.fonts; fontDirs = config.fonts.fonts;
@ -107,7 +107,7 @@ let
localDefs = with builderDefs; builderDefs.passthru.function rec { localDefs = with builderDefs; builderDefs.passthru.function rec {
src = "";/* put a fetchurl here */ src = "";/* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale ttmkfdir]; buildInputs = [mkfontdir mkfontscale];
configureFlags = []; configureFlags = [];
inherit fontDirs; inherit fontDirs;
installPhase = fullDepEntry (" installPhase = fullDepEntry ("
@ -135,13 +135,6 @@ let
rm fonts.alias rm fonts.alias
mkfontdir mkfontdir
mkfontscale 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 cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
") ["minInit" "addInputs"]; ") ["minInit" "addInputs"];
}; };