diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-27 20:27:24 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-27 20:27:24 +0100 |
| commit | e6f61b4cf33887a9231a12e8c766404139a277d8 (patch) | |
| tree | 255e2f713a4c2d86634c907ae469b4d24d29b66e /pkgs/stdenv/linux | |
| parent | 824a1fb5b937c2f85198dfd8e48dd824000b7618 (diff) | |
| download | nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.tar nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.tar.gz nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.tar.bz2 nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.tar.lz nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.tar.xz nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.tar.zst nixlib-e6f61b4cf33887a9231a12e8c766404139a277d8.zip | |
fetchurlBoot: Use Nix's builtin fetchurl function
This removes the need for curl in bootstrapTools, and enables https for bootstrap tarballs.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 9 |
2 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index cd49d4a5a742..965188a0cdd8 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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}" diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 7f7f4c6a2bd1..ef651f643684 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -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 |