diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
| commit | 811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch) | |
| tree | 631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/stdenv/adapters.nix | |
| parent | c34932ef86628b8b30284882d8baaef4c56320dd (diff) | |
| parent | a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff) | |
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts: pkgs/tools/security/gnupg/default.nix
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 c57f1d00f0a5a..a90a00e6d4f32 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 |