From 35e42d3e5c2f2b66f24aec402a5961b35070f55f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 16:00:46 +0000
Subject: [PATCH] * Fix missing description errors.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
---
 pkgs/build-support/gcc-wrapper/default.nix     | 13 ++++++-------
 pkgs/development/compilers/gcc-3.3/default.nix |  9 +++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index cbdab8b1a9aa..91b417060996 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -42,13 +42,12 @@ stdenv.mkDerivation {
   shell = if shell == "" then stdenv.shell else shell;
   
   meta =
-    if gcc != null && (gcc ? meta) then
-      removeAttrs gcc.meta ["priority"] //
-      { description = gcc.meta.description + " (wrapper script)";
-      }
-    else
-      { description = "System C compiler (wrapper script)";
-      };
+    let gcc_ = if gcc != null then gcc else {}; in
+    (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
+    { description =
+        stdenv.lib.getAttr ["meta" "description"] "System C compiler" gcc_
+        + " (wrapper script)";
+    };
 
   # The dynamic linker has different names on different Linux platforms.
   dynamicLinker =
diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc-3.3/default.nix
index 777662af73a9..9aa9e27ac6f7 100644
--- a/pkgs/development/compilers/gcc-3.3/default.nix
+++ b/pkgs/development/compilers/gcc-3.3/default.nix
@@ -8,10 +8,19 @@ assert langC;
 
 stdenv.mkDerivation {
   name = "gcc-3.3.6";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
     md5 = "6936616a967da5a0b46f1e7424a06414";
   };
+  
   inherit noSysDirs langC langCC langFortran;
+
+  meta = {
+    homepage = "http://gcc.gnu.org/";
+    license = "GPL/LGPL";
+    description = "GNU Compiler Collection, 3.3.x";
+  };
 }