fetchurlBoot: Use Nix's builtin fetchurl function

This removes the need for curl in bootstrapTools, and enables https
for bootstrap tarballs.
This commit is contained in:
Eelco Dolstra
2016-02-27 20:27:24 +01:00
parent 824a1fb5b9
commit e6f61b4cf3
3 changed files with 23 additions and 13 deletions
+3 -4
View File
@@ -80,9 +80,9 @@ rec {
'';
shell = "${bootstrapTools}/bin/bash";
initialPath = [bootstrapTools];
fetchurlBoot = import ../../build-support/fetchurl {
stdenv = stage0.stdenv;
curl = bootstrapTools;
fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
inherit system;
};
cc = if isNull gccPlain
@@ -333,7 +333,6 @@ rec {
awk --version
grep --version
gcc --version
curl --version
ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?)
export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"
@@ -10,13 +10,6 @@ rec {
aclSupport = false;
});
curlMinimal = curl.override {
http2Support = false;
zlibSupport = false;
sslSupport = false;
scpSupport = false;
};
busyboxMinimal = busybox.override {
useMusl = true;
enableStatic = true;
@@ -84,8 +77,6 @@ rec {
cp -d ${gnumake}/bin/* $out/bin
cp -d ${patch}/bin/* $out/bin
cp ${patchelf}/bin/* $out/bin
cp ${curlMinimal}/bin/curl $out/bin
cp -d ${curlMinimal}/lib/libcurl* $out/lib
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep