stdenv-linux: Turn allowedRequisites back on

This commit is contained in:
Eelco Dolstra 2014-10-06 22:11:05 +02:00
parent a1d9c56389
commit 14d6454b9a
2 changed files with 2 additions and 4 deletions

View file

@ -8,14 +8,14 @@ rec {
# Override the compiler in stdenv for specific packages. # Override the compiler in stdenv for specific packages.
overrideGCC = stdenv: gcc: stdenv.override { inherit gcc; }; overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; inherit gcc; };
# Add some arbitrary packages to buildInputs for specific packages. # Add some arbitrary packages to buildInputs for specific packages.
# Used to override packages in stdenv like Make. Should not be used # Used to override packages in stdenv like Make. Should not be used
# for other dependencies. # for other dependencies.
overrideInStdenv = stdenv: pkgs: overrideInStdenv = stdenv: pkgs:
stdenv.override (prev: { extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; }); stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; });
# Override the setup script of stdenv. Useful for testing new # Override the setup script of stdenv. Useful for testing new

View file

@ -284,12 +284,10 @@ 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;