public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux bootstrap: remove assertion failure from dev, fixes 'nix eval'

Browse Source 
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.
This commit is contained in:
Will Dietz 2018-04-26 10:19:52 -05:00
parent 5e1603f1fd
commit f31b147f63
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,11 +107,6 @@ let
# Having the proper 'platform' in all the stdenvs allows getting proper # Having the proper 'platform' in all the stdenvs allows getting proper
# linuxHeaders for example. # linuxHeaders for example.
inherit platform; 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; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
}; };
@ -129,8 +124,6 @@ in
__raw = true; __raw = true;
gcc-unwrapped = null; gcc-unwrapped = null;
glibc = assert false; null;
musl = assert false; null;
binutils = null; binutils = null;
coreutils = null; coreutils = null;
gnugrep = null; gnugrep = null;