From 13567556bf0cea954a0fdef6296d05c7be5eaa3c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 May 2007 13:00:49 +0000 Subject: [PATCH] * Give the real GCC a lower priority than the GCC wrapper so that both can be installed in a user environment without conflict. This is useful if you need gcov (which isn't symlinked in the GCC wrapper). svn path=/nixpkgs/trunk/; revision=8809 --- pkgs/build-support/gcc-wrapper/default.nix | 2 +- pkgs/development/compilers/gcc-4.1/default.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index b93747058309..6e67bbf74e6b 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { langF77 = if nativeTools then false else gcc.langF77; shell = if shell == "" then stdenv.shell else shell; - meta = if gcc != null && (gcc ? meta) then gcc.meta else + meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else { description = "System C compiler wrapper"; }; diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index 0bbaf6d02b52..4473d8a229f2 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix @@ -54,5 +54,9 @@ stdenv.mkDerivation { homepage = "http://gcc.gnu.org/"; license = "GPL/LGPL"; description = "GNU Compiler Collection, 4.1.x"; + + # Give the real GCC a lower priority than the GCC wrapper so that + # both can be installed at the same time. + priority = "7"; }; }