diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
| commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
| tree | 4a99561053ba51db60a75389e483784543b105ff /pkgs/stdenv/linux | |
| parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
| parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
| download | nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip | |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 92da0d7873d0..eb793e7687a1 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; @@ -351,6 +344,7 @@ in concatMap (p: [ (getBin p) (getLib p) ]) [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl + texinfo ] # Library dependencies ++ map getLib ( @@ -369,7 +363,7 @@ in inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib pcre; + attr acl paxctl zlib pcre texinfo; ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. |