diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-06 22:11:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-06 22:11:05 +0200 |
| commit | 14d6454b9afa3b94cb4438d8432b545704ad3d41 (patch) | |
| tree | a8cccadfdc25429ce82ab3e78484f62c6767fa21 /pkgs/stdenv/adapters.nix | |
| parent | a1d9c563891beb5ec26ea3293cac9da9f4628b51 (diff) | |
stdenv-linux: Turn allowedRequisites back on
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 09c92b552d48c..d223cf1708cf2 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -8,14 +8,14 @@ rec { # 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. # Used to override packages in stdenv like Make. Should not be used # for other dependencies. 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 |