alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Changed FontDir to also handle TTF.

Browse source 
svn path=/nixos/trunk/; revision=10912
This commit is contained in:
Michael Raskin 2008-03-02 18:46:57 +00:00
parent 0d5c0f946f
commit 16a8462820
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/fontdir.nix
View file

@ -2,7 +2,7 @@ args : with args; with builderDefs {src="";} null;
let localDefs = builderDefs rec { let localDefs = builderDefs rec {
src = "";/* put a fetchurl here */ src = "";/* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale]; buildInputs = [mkfontdir mkfontscale ttmkfdir];
configureFlags = []; configureFlags = [];
fontDirs = import ./fonts.nix {inherit pkgs config;}; fontDirs = import ./fonts.nix {inherit pkgs config;};
installPhase = FullDepEntry (" installPhase = FullDepEntry ("
@ -30,6 +30,13 @@ args : with args; with builderDefs {src="";} null;
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"];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */

2
system/system.nix
View file

@ -184,7 +184,7 @@ rec {
# Font aggregation # Font aggregation
fontDir = import ./fontdir.nix { fontDir = import ./fontdir.nix {
inherit config pkgs ; inherit config pkgs ;
inherit (pkgs) builderDefs ; inherit (pkgs) builderDefs ttmkfdir;
inherit (pkgs.xorg) mkfontdir mkfontscale fontalias; inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
}; };