Author: raskin
Date: Thu Nov 11 13:24:37 2010
New Revision: 24662
URL: https://svn.nixos.org/websvn/nix/?rev=24662&sc=1
Log:
Remove ttmkfdir reference
Modified:
nixos/trunk/modules/config/fonts.nix
Modified: nixos/trunk/modules/config/fonts.nix
==============================================================================
--- nixos/trunk/modules/config/fonts.nix Thu Nov 11 13:10:09 2010
(r24661)
+++ nixos/trunk/modules/config/fonts.nix Thu Nov 11 13:24:37 2010
(r24662)
@@ -98,7 +98,7 @@
###### implementation
let
- inherit (pkgs) builderDefs ttmkfdir;
+ inherit (pkgs) builderDefs;
inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
fontDirs = config.fonts.fonts;
@@ -107,7 +107,7 @@
localDefs = with builderDefs; builderDefs.passthru.function rec {
src = "";/* put a fetchurl here */
- buildInputs = [mkfontdir mkfontscale ttmkfdir];
+ buildInputs = [mkfontdir mkfontscale];
configureFlags = [];
inherit fontDirs;
installPhase = fullDepEntry ("
@@ -135,13 +135,6 @@
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"];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
