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

fontDir compatible with both trunk and (hopefully) stdenv-updates 

svn path=/nixos/trunk/; revision=10293
This commit is contained in:
Michael Raskin 2008-01-25 13:31:59 +00:00
parent e914d28638
commit e5025996ca
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
system/fontdir.nix
View File

@ -1,15 +1,13 @@
args: args : with args; with builderDefs {src="";} null;
with args; let localDefs = builderDefs rec {
stdenv.mkDerivation src = "";/* put a fetchurl here */
{
name="X11-fonts"; buildInputs = [mkfontdir mkfontscale];
phases="installPhase"; configureFlags = [];
fontDirs = import ./fonts.nix {inherit pkgs config;}; fontDirs = import ./fonts.nix {inherit pkgs config;};
buildInputs = [mkfontdir mkfontscale]; installPhase = FullDepEntry ("
inherit fontalias;
installCommand = "
list=''; list='';
for i in \$fontDirs ; do for i in ${toString fontDirs} ; do
if [ -d \$i/ ]; then if [ -d \$i/ ]; then
list=\"\$list \$i\"; list=\"\$list \$i\";
fi; fi;
@ -32,6 +30,18 @@ stdenv.mkDerivation
rm fonts.alias rm fonts.alias
mkfontdir mkfontdir
mkfontscale mkfontscale
cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
"; ") ["minInit" "addInputs"];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "X11-fonts";
builder = writeScript (name + "-builder")
(textClosure localDefs
[installPhase doForceShare doPropagate]);
meta = {
description = "
Directory to contain all X11 fonts requested.
";
};
} }

4
system/system.nix
View File

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