diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-19 13:13:11 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-19 13:13:34 -0400 |
| commit | 0062d0f11d163ca720134f8d5a18bc1696eab1ae (patch) | |
| tree | d6b06b3c3e177527b7b954879ba33e9e1e880d36 /pkgs | |
| parent | 99571aa24225767b87bc9321e018e01affd36e60 (diff) | |
| download | nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.tar nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.tar.gz nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.tar.bz2 nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.tar.lz nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.tar.xz nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.tar.zst nixlib-0062d0f11d163ca720134f8d5a18bc1696eab1ae.zip | |
Mark alternative stdenvs as lowPrio
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36517d484573..9649152d7af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -206,8 +206,7 @@ let defaultStdenv = allStdenvs.stdenv // { inherit platform; }; - stdenvCross = makeStdenvCross defaultStdenv crossSystem binutilsCross - gccCrossStageFinal; + stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); stdenv = if bootStdenv != null then (bootStdenv // {inherit platform;}) else @@ -233,11 +232,11 @@ let # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. - stdenv_32bit = + stdenv_32bit = lowPrio ( if system == "x86_64-linux" then overrideGCC stdenv gcc43_multi else - stdenv; + stdenv); ### BUILD SUPPORT @@ -1821,7 +1820,7 @@ let clang = wrapClang clangUnwrapped; #Use this instead of stdenv to build with clang - clangStdenv = stdenvAdapters.overrideGCC stdenv clang; + clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); clean = callPackage ../development/compilers/clean { }; @@ -2991,7 +2990,7 @@ let # ccacheWrapper = makeOverridable ({ extraConfig ? "" }: wrapGCC (ccache.links extraConfig)) {}; - ccacheStdenv = overrideGCC stdenv ccacheWrapper; + ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper); cgdb = callPackage ../development/tools/misc/cgdb { }; |