Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

This commit is contained in:
Eelco Dolstra 2014-10-06 20:14:26 +02:00
commit c34932ef86

View File

@ -284,10 +284,12 @@ rec {
shellPackage = stage4.pkgs.bash;
};
/*
allowedRequisites = with stage4.pkgs;
[ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv ];
*/
overrides = pkgs: {
inherit gcc;