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

Some more corrections to fontDir; now suitable as fontPath for Xvnc

Browse Source 
svn path=/nixos/trunk/; revision=9410
This commit is contained in:
Michael Raskin 2007-10-05 12:51:05 +00:00
parent 9ce2dbf8d3
commit 5c08d306e5
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
system/fontdir.nix
View File

@ -5,16 +5,32 @@ stdenv.mkDerivation
name="X11-fonts"; name="X11-fonts";
phases="installPhase"; phases="installPhase";
fontDirs = import ./fonts.nix {inherit pkgs config;}; fontDirs = import ./fonts.nix {inherit pkgs config;};
buildInputs = [mkfontdir mkfontscale];
inherit fontalias;
installCommand = " installCommand = "
list='';
for i in \$fontDirs ; do
if [ -d \$i/ ]; then
list=\"\$list \$i\";
fi;
done
list=\$(find \$list -name fonts.dir);
fontDirs='';
for i in \$list ; do
fontDirs=\"\$fontDirs \$(dirname \$i)\";
done;
mkdir -p \$out/share/X11-fonts/; mkdir -p \$out/share/X11-fonts/;
for i in \$fontDirs; do for i in \$(find \$fontDirs -type f); do
if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then j=\${i##*/}
j=\${i#/nix/store/} if ! test -e \$out/share/X11-fonts/\${j}; then
j=\${j%%/*} ln -s \$i \$out/share/X11-fonts/\${j};
if ! test -e \$out/share/X11-fonts/\${j}; then
ln -s \$i \$out/share/X11-fonts/\${j};
fi;
fi; fi;
done; done;
cd \$out/share/X11-fonts/
rm fonts.dir
rm fonts.scale
mkfontdir
mkfontscale
cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias
"; ";
} }

1
system/system.nix
View File

@ -166,6 +166,7 @@ rec {
fontDir = import ./fontdir.nix { fontDir = import ./fontdir.nix {
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
inherit pkgs config; inherit pkgs config;
inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
}; };
# The wrapper setuid programs (since we can't have setuid programs # The wrapper setuid programs (since we can't have setuid programs