diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-04-26 11:45:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:45:11 -0400 |
| commit | 893bf70a1cfe94e257d10ca093c06ddf30dde093 (patch) | |
| tree | 9e902703bea5d066ebeda179fb9abe1fcc81fd76 | |
| parent | 591d8c7a195f7874bf3b8e248a6e4d8b956e747c (diff) | |
| parent | f31b147f638a9b98cee3fcb6a686bbf3ff979265 (diff) | |
| download | nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.tar nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.tar.gz nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.tar.bz2 nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.tar.lz nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.tar.xz nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.tar.zst nixlib-893bf70a1cfe94e257d10ca093c06ddf30dde093.zip | |
Merge pull request #39562 from dtzWill/fix/bootstrap-assert-eval
linux bootstrap: remove assertion failure from dev, fixes 'nix eval'
| -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; |