* 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
This commit is contained in:
parent
e9ed8e8800
commit
13567556bf
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
|||||||
langF77 = if nativeTools then false else gcc.langF77;
|
langF77 = if nativeTools then false else gcc.langF77;
|
||||||
shell = if shell == "" then stdenv.shell else shell;
|
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";
|
{ description = "System C compiler wrapper";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -54,5 +54,9 @@ stdenv.mkDerivation {
|
|||||||
homepage = "http://gcc.gnu.org/";
|
homepage = "http://gcc.gnu.org/";
|
||||||
license = "GPL/LGPL";
|
license = "GPL/LGPL";
|
||||||
description = "GNU Compiler Collection, 4.1.x";
|
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";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user