From 4e0ed004b73cb1641feec25f36ee844abad67696 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Aug 2010 17:00:20 +0000
Subject: [PATCH] Fix some more wrong-on-bootstrap cases

svn path=/nixpkgs/trunk/; revision=23214
---
 .../builder-defs/builder-defs.nix             | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index c82a954a73af..55cc30b9fb23 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -434,7 +434,7 @@ let inherit (builtins) head tail trace; in
         realPhaseNames = 
 	  (optional ([] != attrByPath ["neededDirs"] [] args) "createDirs")
 	  ++
-	  args.phaseNames 
+	  (attrByPath ["phaseNames"] [] args)
 	  ++ 
           ["doForceShare" "doPropagate" "doForceCopy"]
 	  ++
@@ -500,18 +500,20 @@ let inherit (builtins) head tail trace; in
         done
    '') ["minInit" "addInputs" "doUnpack"];
 
-   installFonts = fullDepEntry (''
-           ensureDir $out/share/fonts/truetype/public/${args.name}
-           ensureDir $out/share/fonts/opentype/public/${args.name}
-           ensureDir $out/share/fonts/type1/public/${args.name}
-           ensureDir $out/share/texmf/fonts/enc/${args.name}
-           ensureDir $out/share/texmf/fonts/map/${args.name}
+   installFonts = 
+      let retrievedName = (if args ? name then args.name else ""); in
+   fullDepEntry (''
+           ensureDir $out/share/fonts/truetype/public/${retrievedName}
+           ensureDir $out/share/fonts/opentype/public/${retrievedName}
+           ensureDir $out/share/fonts/type1/public/${retrievedName}
+           ensureDir $out/share/texmf/fonts/enc/${retrievedName}
+           ensureDir $out/share/texmf/fonts/map/${retrievedName}
 
-        cp *.ttf $out/share/fonts/truetype/public/${args.name} || echo No TrueType fonts
-        cp *.otf $out/share/fonts/opentype/public/${args.name} || echo No OpenType fonts
-           cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${args.name} || echo No Type1 Fonts
-           cp *.enc $out/share/texmf/fonts/enc/${args.name} || echo No fontenc data
-           cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data
+        cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts
+        cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts
+           cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${retrievedName} || echo No Type1 Fonts
+           cp *.enc $out/share/texmf/fonts/enc/${retrievedName} || echo No fontenc data
+           cp *.map $out/share/texmf/fonts/map/${retrievedName} || echo No fontmap data
    '') ["minInit" "defEnsureDir"];
 
    simplyShare = shareName: fullDepEntry (''