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

Fix bootstrap calls 

svn path=/nixpkgs/trunk/; revision=23212
This commit is contained in:
Michael Raskin 2010-08-17 16:51:12 +00:00
parent 1946545852
commit fc9f451cad
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/builder-defs/builder-defs.nix
View File

@ -34,6 +34,9 @@ let inherit (builtins) head tail trace; in
else if (hasSuffixHack ".bz2" s) then "plain-bz2" else if (hasSuffixHack ".bz2" s) then "plain-bz2"
else if (hasSuffixHack ".gz" s) then "plain-gz" else if (hasSuffixHack ".gz" s) then "plain-gz"
# For bootstrap calls
else if (s ==("" + (substring 0 0 s))) then "empty"
else (abort "unknown archive type : ${s}")); else (abort "unknown archive type : ${s}"));
# changing this ? see [1] # changing this ? see [1]
@ -241,6 +244,8 @@ let inherit (builtins) head tail trace; in
NAME=\$(basename ${s} .gz) NAME=\$(basename ${s} .gz)
gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-} gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-}
cd \$(basename ${s} .gz) cd \$(basename ${s} .gz)
" else if (archiveType s) == "empty" then "
echo No source to unpack - doing nothing ..
" else (abort "unknown archive type : ${s}"))+ " else (abort "unknown archive type : ${s}"))+
# goSrcDir is typically something like "cd mysubdir" .. but can be anything else # goSrcDir is typically something like "cd mysubdir" .. but can be anything else
(if args ? goSrcDir then args.goSrcDir else "") (if args ? goSrcDir then args.goSrcDir else "")