ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

restore stdenv.glibc, will remove separately.

Browse Source
This commit is contained in:
Will Dietz 2018-02-09 08:43:39 -06:00
parent 22a5393041
commit 119920faa6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/stdenv/linux/default.nix
View File

@ -107,7 +107,8 @@ let
# stdenv.glibc is used by GCC build to figure out the system-level # stdenv.glibc is used by GCC build to figure out the system-level
# /usr/include directory. # /usr/include directory.
# inherit (prevStage) glibc; # TODO: Remove this!
inherit (prevStage) glibc;
}; };
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
}; };
@ -333,7 +334,9 @@ in
inherit (prevStage.stdenv) fetchurlBoot; inherit (prevStage.stdenv) fetchurlBoot;
extraAttrs = { extraAttrs = {
# inherit (prevStage) glibc; # TODO: remove this!
inherit (prevStage) glibc;
inherit platform bootstrapTools; inherit platform bootstrapTools;
shellPackage = prevStage.bash; shellPackage = prevStage.bash;
}; };