BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Swap conditions of stdenvOverrides to prevent infinite loops while evaluating stdenvCross.

Browse source 
While evaluating the derivation of xbursttools:
  the condition `pkgs.stdenv ? overrides` causes the evaluation of
  `stdenvCross`.  This evaluation comes too early during the execution, as
  it prevents the resolution of names such as `pkgs.lib`, and
  `stdenvAdapaters.makeStdenvCross`, which we want to take from `pkgs`
  instead of `self` in following patches.

By swapping the conditions, we effectively make the resolution of `pkgs.lib`
and `stdenvAdapaters.makeStdenvCross` possible through the pkgs attribute.
This commit is contained in:
Nicolas B. Pierron 2016-03-20 13:15:37 +00:00
parent 8d355b8d85
commit 7f3a4f4287
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View file

@ -100,7 +100,7 @@ let
# otherwise the basic overrided packages will not be built with the
# crossStdenv adapter.
stdenvOverrides = pkgs:
lib.optionalAttrs (pkgs.stdenv ? overrides && crossSystem == null)
lib.optionalAttrs (crossSystem == null && pkgs.stdenv ? overrides)
(pkgs.stdenv.overrides pkgs);
# The un-overriden packages, passed to `overrider'.