* Some meta.description attributes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14712
wip/yesman
Eelco Dolstra 15 years ago
parent 50e59f22c1
commit e032d40614
  1. 11
      pkgs/build-support/gcc-wrapper/default.nix
  2. 4
      pkgs/stdenv/generic/default.nix

@ -34,9 +34,14 @@ stdenv.mkDerivation {
langFortran = if nativeTools then false else gcc ? langFortran;
shell = if shell == "" then stdenv.shell else shell;
meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else
{ description = "System C compiler wrapper";
};
meta =
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.
dynamicLinker =

@ -30,6 +30,10 @@ let {
}
// {
meta = {
description = "The default build environment for Unix packages in Nixpkgs";
};
# Add a utility function to produce derivations that use this
# stdenv and its shell.

Loading…
Cancel
Save