JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix missing description errors.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
This commit is contained in:
Eelco Dolstra 2009-04-19 16:00:46 +00:00
parent 40f01daa81
commit 35e42d3e5c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -42,12 +42,11 @@ stdenv.mkDerivation {
shell = if shell == "" then stdenv.shell else shell; shell = if shell == "" then stdenv.shell else shell;
meta = meta =
if gcc != null && (gcc ? meta) then let gcc_ = if gcc != null then gcc else {}; in
removeAttrs gcc.meta ["priority"] // (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
{ description = gcc.meta.description + " (wrapper script)"; { description =
} stdenv.lib.getAttr ["meta" "description"] "System C compiler" gcc_
else + " (wrapper script)";
{ 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.

9
pkgs/development/compilers/gcc-3.3/default.nix
View File

@ -8,10 +8,19 @@ assert langC;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gcc-3.3.6"; name = "gcc-3.3.6";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2; url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
md5 = "6936616a967da5a0b46f1e7424a06414"; md5 = "6936616a967da5a0b46f1e7424a06414";
}; };
inherit noSysDirs langC langCC langFortran; inherit noSysDirs langC langCC langFortran;
meta = {
homepage = "http://gcc.gnu.org/";
license = "GPL/LGPL";
description = "GNU Compiler Collection, 3.3.x";
};
} }