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

Fix some more wrong-on-bootstrap cases

Browse Source 
svn path=/nixpkgs/trunk/; revision=23214
This commit is contained in:
Michael Raskin
2010-08-17 17:00:20 +00:00
parent 4b4ab6551c
commit 4e0ed004b7
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/builder-defs/builder-defs.nix
+14 -12
View File
@@ -434,7 +434,7 @@ let inherit (builtins) head tail trace; in
realPhaseNames = realPhaseNames =
(optional ([] != attrByPath ["neededDirs"] [] args) "createDirs") (optional ([] != attrByPath ["neededDirs"] [] args) "createDirs")
++ ++
args.phaseNames (attrByPath ["phaseNames"] [] args)
++ ++
["doForceShare" "doPropagate" "doForceCopy"] ["doForceShare" "doPropagate" "doForceCopy"]
++ ++
@@ -500,18 +500,20 @@ let inherit (builtins) head tail trace; in
done done
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
installFonts = fullDepEntry ('' installFonts =
ensureDir $out/share/fonts/truetype/public/${args.name} let retrievedName = (if args ? name then args.name else ""); in
ensureDir $out/share/fonts/opentype/public/${args.name} fullDepEntry (''
ensureDir $out/share/fonts/type1/public/${args.name} ensureDir $out/share/fonts/truetype/public/${retrievedName}
ensureDir $out/share/texmf/fonts/enc/${args.name} ensureDir $out/share/fonts/opentype/public/${retrievedName}
ensureDir $out/share/texmf/fonts/map/${args.name} 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 *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts
cp *.otf $out/share/fonts/opentype/public/${args.name} || echo No OpenType fonts cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts
cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${args.name} || echo No Type1 Fonts cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${retrievedName} || echo No Type1 Fonts
cp *.enc $out/share/texmf/fonts/enc/${args.name} || echo No fontenc data cp *.enc $out/share/texmf/fonts/enc/${retrievedName} || echo No fontenc data
cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data cp *.map $out/share/texmf/fonts/map/${retrievedName} || echo No fontmap data
'') ["minInit" "defEnsureDir"]; '') ["minInit" "defEnsureDir"];
simplyShare = shareName: fullDepEntry ('' simplyShare = shareName: fullDepEntry (''