fetchurl: cleanup, better errors

Also fix what seems like bugs in uncommon `stdenv`s.
This commit is contained in:
Jan Malakhovski
2018-02-18 14:24:53 +00:00
parent ecf4825f32
commit a89899ce4e
5 changed files with 23 additions and 18 deletions
+1
View File
@@ -118,6 +118,7 @@ in rec {
initialPath = [ bootstrapTools ];
fetchurlBoot = import ../../build-support/fetchurl {
inherit lib;
stdenvNoCC = stage0.stdenv;
curl = bootstrapTools;
};
+2 -1
View File
@@ -29,7 +29,8 @@ let inherit (localSystem) system; in
inherit bootstrapTools;
fetchurl = import ../../build-support/fetchurl {
inherit stdenv;
inherit lib;
stdenvNoCC = stdenv;
curl = bootstrapTools;
};
+1 -1
View File
@@ -131,7 +131,7 @@ in
};
fetchurl = import ../../build-support/fetchurl {
inherit stdenv;
inherit lib stdenvNoCC;
# Curl should be in /usr/bin or so.
curl = null;
};