From 14dae2b11a19ef5bcfc5749afbe32d9605eee2b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Sep 2004 21:20:15 +0000
Subject: [PATCH] * Revert: do install the glibc locales.

svn path=/nixpkgs/trunk/; revision=1460
---
 pkgs/system/all-packages-generic.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 20af32d5c84..026038e74b2 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -255,15 +255,13 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  gcc34 = (import ../build-support/gcc-wrapper) {
+  gcc33 = (import ../build-support/gcc-wrapper) {
     nativeTools = false;
     nativeGlibc = false;
-    gcc = (import ../development/compilers/gcc-3.4) {
+    gcc = (import ../development/compilers/gcc-3.3) {
       inherit fetchurl stdenv noSysDirs;
-      profiledCompiler = true;
     };
-    binutils = stdenv.gcc.binutils;
-    glibc = stdenv.gcc.glibc;
+    inherit (stdenv.gcc) binutils glibc;
     inherit stdenv;
   };
 
@@ -273,8 +271,7 @@ rec {
     gcc = (import ../development/compilers/gcc-2.95) {
       inherit fetchurl stdenv noSysDirs;
     };
-    binutils = stdenv.gcc.binutils;
-    glibc = stdenv.gcc.glibc;
+    inherit (stdenv.gcc) binutils glibc;
     inherit stdenv;
   };
 
@@ -287,8 +284,7 @@ rec {
       langF77 = true;
       langCC = false;
     };
-    binutils = stdenv.gcc.binutils;
-    glibc = stdenv.gcc.glibc;
+    inherit (stdenv.gcc) binutils glibc;
     inherit stdenv;
   };
 
@@ -457,7 +453,7 @@ rec {
 
   glibc = (import ../development/libraries/glibc) {
     inherit fetchurl stdenv kernelHeaders;
-    installLocales = false;
+    installLocales = true;
   };
 
   aterm = (import ../development/libraries/aterm) {