From 2bf90b3fbf05391d19ea9c4c13abf5e23ca8d319 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Jul 2004 12:00:19 +0000
Subject: [PATCH] * gcc-wrapper: inherit gcc's name by default.

* gcc: upgraded to 3.4.1.

  Zie je wel, Martin, gcc is niet eng :-)

svn path=/nixpkgs/trunk/; revision=1128
---
 pkgs/build-support/gcc-wrapper/default.nix     | 5 +++--
 pkgs/development/compilers/gcc-3.4/default.nix | 6 +++---
 pkgs/system/all-packages-generic.nix           | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 4dfacf9b3b5..80c8c7abd64 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -5,7 +5,7 @@
 # stdenv.mkDerivation provides a wrapper that sets up the right environment
 # variables so that the compiler and the linker just "work".
 
-{ name, stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
+{ name ? "", stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
 , gcc ? null, glibc ? null, binutils ? null, shell ? ""
 }:
 
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
   gccWrapper = ./gcc-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
   utils = ./utils.sh;
-  inherit name nativeTools nativeGlibc nativePrefix gcc glibc binutils;
+  inherit nativeTools nativeGlibc nativePrefix gcc glibc binutils;
+  name = if name == "" then gcc.name else name;
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;
   langF77 = if nativeTools then false else gcc.langF77;
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index 3adfc5e4162..a68dc31aa26 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@@ -6,11 +6,11 @@
 assert langC;
 
 stdenv.mkDerivation {
-  name = "gcc-3.4.0";
+  name = "gcc-3.4.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.0/gcc-3.4.0.tar.bz2;
-    md5 = "85c6fc83d51be0fbb4f8205accbaff59";
+    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.1/gcc-3.4.1.tar.bz2;
+    md5 = "31b459062499f9f68d451db9cbf3205c";
   };
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch];
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 39a2c491bb7..39c23209da6 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -207,7 +207,6 @@ rec {
   };
 
   gcc340 = (import ../build-support/gcc-wrapper) {
-    name = "gcc-3.4.0";
     nativeTools = false;
     nativeGlibc = false;
     gcc = (import ../development/compilers/gcc-3.4) {