From f31b147f638a9b98cee3fcb6a686bbf3ff979265 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Apr 2018 10:19:52 -0500 Subject: [PATCH] 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. --- pkgs/stdenv/linux/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2eb55ae439b..15d3fde965f 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;