diff options
author | Will Dietz <w@wdtz.org> | 2018-04-26 10:19:52 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-04-26 10:19:52 -0500 |
commit | f31b147f638a9b98cee3fcb6a686bbf3ff979265 (patch) | |
tree | f1e96ae3a487ccfb9a564e7271fe3b9e0a1a1d17 /pkgs/stdenv/linux | |
parent | 5e1603f1fde4c2b77ec3f1c560fde30c735efb81 (diff) | |
download | nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.tar nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.tar.gz nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.tar.bz2 nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.tar.lz nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.tar.xz nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.tar.zst nixlib-f31b147f638a9b98cee3fcb6a686bbf3ff979265.zip |
linux bootstrap: remove assertion failure from dev, fixes 'nix eval'
As in: $ nix eval -f . bash Also remove the glibc propagation inherit that made these necessary, stages handle propagating libc themselves (apparently) and AFAICT no hashes are changed as a result of this.
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2eb55ae439b5..15d3fde965f1 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -107,11 +107,6 @@ let # Having the proper 'platform' in all the stdenvs allows getting proper # linuxHeaders for example. inherit platform; - - # stdenv.glibc is used by GCC build to figure out the system-level - # /usr/include directory. - # TODO: Remove this! - inherit (prevStage) glibc; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -129,8 +124,6 @@ in __raw = true; gcc-unwrapped = null; - glibc = assert false; null; - musl = assert false; null; binutils = null; coreutils = null; gnugrep = null; |