diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-09 08:43:39 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:45:03 -0600 |
| commit | 119920faa6717f8075e0ea44553203171a71f9ea (patch) | |
| tree | 83aac5c4f2cfd08e1b7d6918056a13d8746f044b /pkgs/stdenv/linux | |
| parent | 22a5393041bd263111e0a7935205876851063969 (diff) | |
| download | nixlib-119920faa6717f8075e0ea44553203171a71f9ea.tar nixlib-119920faa6717f8075e0ea44553203171a71f9ea.tar.gz nixlib-119920faa6717f8075e0ea44553203171a71f9ea.tar.bz2 nixlib-119920faa6717f8075e0ea44553203171a71f9ea.tar.lz nixlib-119920faa6717f8075e0ea44553203171a71f9ea.tar.xz nixlib-119920faa6717f8075e0ea44553203171a71f9ea.tar.zst nixlib-119920faa6717f8075e0ea44553203171a71f9ea.zip | |
restore stdenv.glibc, will remove separately.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index a214f8a02c38..2baa8c0479ce 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -107,7 +107,8 @@ let # stdenv.glibc is used by GCC build to figure out the system-level # /usr/include directory. - # inherit (prevStage) glibc; + # TODO: Remove this! + inherit (prevStage) glibc; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -333,7 +334,9 @@ in inherit (prevStage.stdenv) fetchurlBoot; extraAttrs = { - # inherit (prevStage) glibc; + # TODO: remove this! + inherit (prevStage) glibc; + inherit platform bootstrapTools; shellPackage = prevStage.bash; }; |