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

fix evaluation

Browse Source
This commit is contained in:
Robin Gloster 2016-02-27 00:43:49 +00:00
parent 3477e662e6
commit b3d9562fc8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -198,14 +198,14 @@ let
}; };
# We use pkgs_ because accessing pkgs would lead to an infinite recursion in stdenvOverrides # We use pkgs_ because accessing pkgs would lead to an infinite recursion in stdenvOverrides
defaultStdenv = stdenvAdapters.useHardenFlags ( defaultStdenv = (import ../stdenv/adapters.nix pkgs_).useHardenFlags (
pkgs_.allStdenvs.stdenv // { inherit platform; } pkgs_.allStdenvs.stdenv // { inherit platform; }
); );
stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
stdenv = stdenv =
if bootStdenv != null then (stdenvAdapters.useHardenFlags bootStdenv // {inherit platform;}) else if bootStdenv != null then ((import ../stdenv/adapters.nix pkgs_).useHardenFlags bootStdenv // {inherit platform;}) else
if crossSystem != null then if crossSystem != null then
stdenvCross stdenvCross
else else