Merge pull request #39562 from dtzWill/fix/bootstrap-assert-eval

linux bootstrap: remove assertion failure from dev, fixes 'nix eval'
This commit is contained in:
John Ericson 2018-04-26 11:45:11 -04:00 committed by GitHub
commit 893bf70a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;