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

Mark alternative stdenvs as lowPrio

Browse Source
This commit is contained in:
Eelco Dolstra 2012-09-19 13:13:11 -04:00
parent 99571aa242
commit 0062d0f11d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,8 +206,7 @@ let
defaultStdenv = allStdenvs.stdenv // { inherit platform; }; defaultStdenv = allStdenvs.stdenv // { inherit platform; };
stdenvCross = makeStdenvCross defaultStdenv crossSystem binutilsCross stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
gccCrossStageFinal;
stdenv = stdenv =
if bootStdenv != null then (bootStdenv // {inherit platform;}) else 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, # A stdenv capable of building 32-bit binaries. On x86_64-linux,
# it uses GCC compiled with multilib support; on i686-linux, it's # it uses GCC compiled with multilib support; on i686-linux, it's
# just the plain stdenv. # just the plain stdenv.
stdenv_32bit = stdenv_32bit = lowPrio (
if system == "x86_64-linux" then if system == "x86_64-linux" then
overrideGCC stdenv gcc43_multi overrideGCC stdenv gcc43_multi
else else
stdenv; stdenv);
### BUILD SUPPORT ### BUILD SUPPORT
@ -1821,7 +1820,7 @@ let
clang = wrapClang clangUnwrapped; clang = wrapClang clangUnwrapped;
#Use this instead of stdenv to build with clang #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 { }; clean = callPackage ../development/compilers/clean { };
@ -2991,7 +2990,7 @@ let
# #
ccacheWrapper = makeOverridable ({ extraConfig ? "" }: ccacheWrapper = makeOverridable ({ extraConfig ? "" }:
wrapGCC (ccache.links extraConfig)) {}; wrapGCC (ccache.links extraConfig)) {};
ccacheStdenv = overrideGCC stdenv ccacheWrapper; ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper);
cgdb = callPackage ../development/tools/misc/cgdb { }; cgdb = callPackage ../development/tools/misc/cgdb { };