diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-02-17 18:44:43 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-18 14:24:53 +0000 |
| commit | a89899ce4e50f2851c7c1c426200e34d2de1192c (patch) | |
| tree | a1c165cccb347b083ca1428e5945d065c26e07f4 /pkgs/stdenv | |
| parent | ecf4825f325298e3b78665e7e6295c039dfe969f (diff) | |
fetchurl: cleanup, better errors
Also fix what seems like bugs in uncommon `stdenv`s.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/freebsd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 28b2f203dae56..27b3c176a2a7b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -118,6 +118,7 @@ in rec { initialPath = [ bootstrapTools ]; fetchurlBoot = import ../../build-support/fetchurl { + inherit lib; stdenvNoCC = stage0.stdenv; curl = bootstrapTools; }; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 6ab8bf217269f..b3a6cedad8419 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -29,7 +29,8 @@ let inherit (localSystem) system; in inherit bootstrapTools; fetchurl = import ../../build-support/fetchurl { - inherit stdenv; + inherit lib; + stdenvNoCC = stdenv; curl = bootstrapTools; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 558a77281edb4..19efac3700a65 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -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; }; |