diff --git a/system/fontdir.nix b/system/fontdir.nix index c33c627ba637..adb6cd64df01 100644 --- a/system/fontdir.nix +++ b/system/fontdir.nix @@ -2,7 +2,7 @@ args : with args; with builderDefs {src="";} null; let localDefs = builderDefs rec { src = "";/* put a fetchurl here */ - buildInputs = [mkfontdir mkfontscale]; + buildInputs = [mkfontdir mkfontscale ttmkfdir]; configureFlags = []; fontDirs = import ./fonts.nix {inherit pkgs config;}; installPhase = FullDepEntry (" @@ -30,6 +30,13 @@ args : with args; with builderDefs {src="";} null; 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"]; } null; /* null is a terminator for sumArgs */ diff --git a/system/system.nix b/system/system.nix index ee8663b5ccc7..2a37622b6c0e 100644 --- a/system/system.nix +++ b/system/system.nix @@ -184,7 +184,7 @@ rec { # Font aggregation fontDir = import ./fontdir.nix { inherit config pkgs ; - inherit (pkgs) builderDefs ; + inherit (pkgs) builderDefs ttmkfdir; inherit (pkgs.xorg) mkfontdir mkfontscale fontalias; };