diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-18 21:20:15 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-18 21:20:15 +0000 |
| commit | 14dae2b11a19ef5bcfc5749afbe32d9605eee2b6 (patch) | |
| tree | f357e2a7b42a2a9a36f0ec2e11129f646d40fdac /pkgs | |
| parent | 70483bdd3d8e131a3277fe5c7b6fcf6f2f5f8411 (diff) | |
| download | nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.tar nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.tar.gz nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.tar.bz2 nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.tar.lz nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.tar.xz nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.tar.zst nixpkgs-14dae2b11a19ef5bcfc5749afbe32d9605eee2b6.zip | |
* Revert: do install the glibc locales.
svn path=/nixpkgs/trunk/; revision=1460
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 16 |
1 files 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) { |