diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-19 14:05:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 14:05:12 +0000 |
| commit | e37b756b91a0713cefdf8a53d78feadcd00a40fc (patch) | |
| tree | 316da057a58fa4f5f275c515432b38ce54a41871 /pkgs/stdenv | |
| parent | c10288c171fcec37821c28b96437e933e41033d8 (diff) | |
| parent | a89899ce4e50f2851c7c1c426200e34d2de1192c (diff) | |
| download | nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.tar nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.tar.gz nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.tar.bz2 nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.tar.lz nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.tar.xz nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.tar.zst nixpkgs-e37b756b91a0713cefdf8a53d78feadcd00a40fc.zip | |
Merge pull request #35110 from oxij/pkgs/pretty-fetchurl
fetchurl: cleanup, better errors
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 28b2f203dae..27b3c176a2a 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 6ab8bf21726..b3a6cedad84 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 558a77281ed..19efac3700a 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; }; |