From 6733486ec8e33bf923b95e2ca5dfe4c7b2ea8777 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 20 Dec 2007 04:36:30 +0000
Subject: [PATCH] Corrected fontDir builder; beginning of changes to allow
 configuration having multiple variaions in GRUB menu/

svn path=/nixos/trunk/; revision=9957
---
 installer/grub-menu-builder.sh | 2 ++
 system/system.nix              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index be4e5d26a5e4..6fe5c8dd149b 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -89,6 +89,8 @@ EOF
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
 for generation in $(
+	(cd $default/fine-tune && ls -d *) \
+    | sort -n) $(
     (cd /nix/var/nix/profiles && ls -d system-*-link) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
diff --git a/system/system.nix b/system/system.nix
index 922e14476d59..6388906f705a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -178,7 +178,7 @@ rec {
 
   # Font aggregation
   fontDir = import ./fontdir.nix {
-    inherit (pkgs) stdenv;
+    stdenv = pkgs.stdenvUsingSetupNew2;
     inherit pkgs config;
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };