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

Corrected fontDir builder; beginning of changes to allow configuration having multiple variaions in GRUB menu/

Browse Source 
svn path=/nixos/trunk/; revision=9957
This commit is contained in:
Michael Raskin 2007-12-20 04:36:30 +00:00
parent 4892139b38
commit 6733486ec8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/grub-menu-builder.sh
View File

@ -89,6 +89,8 @@ EOF
# Add all generations of the system profile to the menu, in reverse # Add all generations of the system profile to the menu, in reverse
# (most recent to least recent) order. # (most recent to least recent) order.
for generation in $( for generation in $(
(cd $default/fine-tune && ls -d *) \
| sort -n) $(
(cd /nix/var/nix/profiles && ls -d system-*-link) \ (cd /nix/var/nix/profiles && ls -d system-*-link) \
| sed 's/system-\([0-9]\+\)-link/\1/' \ | sed 's/system-\([0-9]\+\)-link/\1/' \
| sort -n -r); do | sort -n -r); do

2
system/system.nix
View File

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