Author: raskin
Date: Tue Aug 17 17:00:20 2010
New Revision: 23214
URL: https://svn.nixos.org/websvn/nix/?rev=23214&sc=1
Log:
Fix some more wrong-on-bootstrap cases
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue Aug
17 16:53:34 2010 (r23213)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue Aug
17 17:00:20 2010 (r23214)
@@ -434,7 +434,7 @@
realPhaseNames =
(optional ([] != attrByPath ["neededDirs"] [] args) "createDirs")
++
- args.phaseNames
+ (attrByPath ["phaseNames"] [] args)
++
["doForceShare" "doPropagate" "doForceCopy"]
++
@@ -500,18 +500,20 @@
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}
-
- 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
+ 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/${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 (''
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
