diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 4dfacf9b3b53..80c8c7abd647 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 3adfc5e41625..a68dc31aa26a 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 39a2c491bb7b..39c23209da6c 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) {