* Some meta.description attributes.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14712
This commit is contained in:
parent
50e59f22c1
commit
e032d40614
@ -34,9 +34,14 @@ stdenv.mkDerivation {
|
|||||||
langFortran = if nativeTools then false else gcc ? langFortran;
|
langFortran = if nativeTools then false else gcc ? langFortran;
|
||||||
shell = if shell == "" then stdenv.shell else shell;
|
shell = if shell == "" then stdenv.shell else shell;
|
||||||
|
|
||||||
meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else
|
meta =
|
||||||
{ description = "System C compiler wrapper";
|
if gcc != null && (gcc ? meta) then
|
||||||
};
|
removeAttrs gcc.meta ["priority"] //
|
||||||
|
{ description = gcc.meta.description + " (wrapper script)";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{ description = "System C compiler (wrapper script)";
|
||||||
|
};
|
||||||
|
|
||||||
# The dynamic linker has different names on different Linux platforms.
|
# The dynamic linker has different names on different Linux platforms.
|
||||||
dynamicLinker =
|
dynamicLinker =
|
||||||
|
@ -31,6 +31,10 @@ let {
|
|||||||
|
|
||||||
// {
|
// {
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "The default build environment for Unix packages in Nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
# Add a utility function to produce derivations that use this
|
# Add a utility function to produce derivations that use this
|
||||||
# stdenv and its shell.
|
# stdenv and its shell.
|
||||||
mkDerivation = attrs:
|
mkDerivation = attrs:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user