From fc9f451cadb6e546f4c13407f1855b2cd2e1b6fb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 17 Aug 2010 16:51:12 +0000 Subject: [PATCH] Fix bootstrap calls svn path=/nixpkgs/trunk/; revision=23212 --- pkgs/build-support/builder-defs/builder-defs.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 3ef0c862964..c82a954a73a 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -34,6 +34,9 @@ let inherit (builtins) head tail trace; in else if (hasSuffixHack ".bz2" s) then "plain-bz2" 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}")); # changing this ? see [1] @@ -241,6 +244,8 @@ let inherit (builtins) head tail trace; in NAME=\$(basename ${s} .gz) gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-} cd \$(basename ${s} .gz) + " else if (archiveType s) == "empty" then " + echo No source to unpack - doing nothing .. " else (abort "unknown archive type : ${s}"))+ # goSrcDir is typically something like "cd mysubdir" .. but can be anything else (if args ? goSrcDir then args.goSrcDir else "")