From f26130770bbd38b02fab9c1579bba1cc4185915a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jun 2009 13:06:02 +0000 Subject: [PATCH] * nix-env -i gcc-wrapper matched two derivations, lower the priority of the second one. svn path=/nixpkgs/trunk/; revision=15972 --- 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 99c6a5649b79..43dc8ff226b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1638,10 +1638,10 @@ let gcc43 = useFromStdenv "gcc" gcc43_real; - gcc43_real = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { + gcc43_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { inherit fetchurl stdenv texinfo gmp mpfr noSysDirs; profiledCompiler = true; - }); + })); gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43_real.gcc.override { stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);