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

Cleanup legacy settings in stdenvLinux 

This causes a mass rebuild, because it changes the hashes of
stdenvLinux, as it enable tests for coreutils.
This commit is contained in:
Gergely Risko 2014-09-11 01:20:46 +02:00
parent c5df246ba9
commit 6fe1ac69f9
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,6 @@ rec {
mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
gccPlain = pkgs.gcc.gcc; gccPlain = pkgs.gcc.gcc;
}; };
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
@ -235,14 +234,6 @@ rec {
# other purposes (binutils and top-level pkgs) too. # other purposes (binutils and top-level pkgs) too.
inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders; inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders;
# Accidental historical garbage
#
# TODO(errge): this historical mistake accidentally disables
# tests for the production coreutils, we definitely don't want
# that, so fix this in another commit! (But will change drv and
# out hashes.)
coreutils = pkgs.coreutils.override { stdenv = stage4.stdenv.override { extraAttrs = { inherit platform; }; }; };
gcc = import ../../build-support/gcc-wrapper { gcc = import ../../build-support/gcc-wrapper {
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
@ -250,7 +241,7 @@ rec {
libc = stage4.pkgs.glibc; libc = stage4.pkgs.glibc;
inherit (stage4.pkgs) binutils coreutils; inherit (stage4.pkgs) binutils coreutils;
name = ""; name = "";
stdenv = stage0.stdenv; # TODO(errge): legacy stdenv = stage4.stdenv;
shell = stage4.pkgs.bash + "/bin/bash"; shell = stage4.pkgs.bash + "/bin/bash";
}; };
}; };