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

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

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-06 20:14:26 +02:00
commit c34932ef86
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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