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

Corrected X11-fonts, now it is linked in /var/run/current-system

Browse Source 
svn path=/nixos/trunk/; revision=9409
This commit is contained in:
Michael Raskin 2007-10-05 07:45:56 +00:00
parent 44d09afffb
commit 9ce2dbf8d3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/fontdir.nix
View File

@ -5,13 +5,13 @@ 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;};
installPhase = " installCommand = "
mkdir -p \$out/share/X11-fonts/; mkdir -p \$out/share/X11-fonts/;
for i in \$fontDirs; do for i in \$fontDirs; do
if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then
j=\${i#/nix/store/} j=\${i#/nix/store/}
j=\${j%%/*} j=\${j%%/*}
if ! test -e \$out/share/X11-fonts/\${g}; 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};
fi; fi;
fi; fi;

5
system/system.nix
View File

@ -229,7 +229,8 @@ rec {
] ]
++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo ++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs) ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
++ (config.get ["environment" "extraPackages"]) pkgs; ++ (config.get ["environment" "extraPackages"]) pkgs
++ pkgs.lib.optional (config.get ["fonts" "enableFontDir"]) fontDir;
# We don't want to put all of `startPath' and `path' in $PATH, since # We don't want to put all of `startPath' and `path' in $PATH, since
@ -327,8 +328,6 @@ rec {
inherit activateConfiguration; inherit activateConfiguration;
inherit grubMenuBuilder; inherit grubMenuBuilder;
inherit etc; inherit etc;
fontDir = (if config.get ["fonts" "enableFontDir"] then
fontDir else null);
inherit systemPath; inherit systemPath;
kernel = kernel + "/vmlinuz"; kernel = kernel + "/vmlinuz";
initrd = initialRamdisk + "/initrd"; initrd = initialRamdisk + "/initrd";