From b3d9562fc853282702c82884edc8ded50fd517c1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 27 Feb 2016 00:43:49 +0000 Subject: [PATCH] fix evaluation --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 376fde4a8b00..d3aca452704b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -198,14 +198,14 @@ let }; # 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; } ); stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); 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 stdenvCross else