Skip to content

Commit

Permalink
fetchurlBoot: Use Nix's builtin fetchurl function
Browse files Browse the repository at this point in the history
This removes the need for curl in bootstrapTools, and enables https
for bootstrap tarballs.
  • Loading branch information
edolstra committed Feb 27, 2016
1 parent 824a1fb commit e6f61b4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
20 changes: 20 additions & 0 deletions pkgs/build-support/fetchurl/boot.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
let mirrors = import ./mirrors.nix; in

{ system }:

{ url ? builtins.head urls
, urls ? []
, sha256
}:

import <nix/fetchurl.nix> {
inherit system sha256;

url =
# Handle mirror:// URIs. Since <nix/fetchurl.nix> currently
# supports only one URI, use the first listed mirror.
let m = builtins.match "mirror://([a-z]+)/(.*)" url; in
if m == null then url
else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1);

}
7 changes: 3 additions & 4 deletions pkgs/stdenv/linux/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down
9 changes: 0 additions & 9 deletions pkgs/stdenv/linux/make-bootstrap-tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e6f61b4

Please sign in to comment.