movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Added some xfs and general font changes.

Browse source 
svn path=/nixos/trunk/; revision=9966
This commit is contained in:
Michael Raskin 2007-12-25 12:16:38 +00:00
parent ba09f592c8
commit b3fa4f1e4e
6 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
system/fontdir.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation
fontDirs=\"\$fontDirs \$(dirname \$i)\"; fontDirs=\"\$fontDirs \$(dirname \$i)\";
done; done;
mkdir -p \$out/share/X11-fonts/; mkdir -p \$out/share/X11-fonts/;
for i in \$(find \$fontDirs -type f); do for i in \$(find \$fontDirs -type f -o -type l); do
j=\${i##*/} j=\${i##*/}
if ! test -e \$out/share/X11-fonts/\${j}; then if ! test -e \$out/share/X11-fonts/\${j}; then
ln -s \$i \$out/share/X11-fonts/\${j}; ln -s \$i \$out/share/X11-fonts/\${j};
@ -29,6 +29,7 @@ stdenv.mkDerivation
cd \$out/share/X11-fonts/ cd \$out/share/X11-fonts/
rm fonts.dir rm fonts.dir
rm fonts.scale rm fonts.scale
rm fonts.alias
mkfontdir mkfontdir
mkfontscale mkfontscale
cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias

8
system/options.nix
View file

@ -860,6 +860,14 @@
Default colour depth. Default colour depth.
"; ";
}; };
useXFS = mkOption {
default = false;
example = "unix/:7100";
description = "
Way to access the X Font Server to use.
";
};
}; };

2
upstart-jobs/apache-httpd/default.nix
View file

@ -222,7 +222,7 @@ in
description "Apache HTTPD" description "Apache HTTPD"
start on ${startingDependency}/started start on ${startingDependency}/started
stop on ${startingDependency}/stop stop on shutdown
respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
''; '';

2
upstart-jobs/xfs.nix
View file

@ -12,7 +12,7 @@ rec {
job = " job = "
description = \"X Font Server\" description = \"X Font Server\"
start on ${startingDependency}/started start on ${startingDependency}/started
stop on ${startingDependency}/stop stop on shutdown
respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile} respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
"; ";

1
upstart-jobs/xserver.conf
View file

@ -1,5 +1,6 @@
Section "Files" Section "Files"
# Font directories. # Font directories.
@xfs@
@fontPaths@ @fontPaths@
# Module (driver) directories. # Module (driver) directories.

3
upstart-jobs/xserver.nix
View file

@ -116,6 +116,9 @@ let
serverLayoutOptions = cfg.serverLayoutOptions; serverLayoutOptions = cfg.serverLayoutOptions;
defaultDepth = cfg.defaultDepth; defaultDepth = cfg.defaultDepth;
xfs = (if cfg.useXFS == false then "" else
"FontPath \"${toString cfg.useXFS}\"");
buildCommand = " buildCommand = "
buildCommand= # urgh, don't substitute this buildCommand= # urgh, don't substitute this