* Revert: do install the glibc locales.
svn path=/nixpkgs/trunk/; revision=1460
This commit is contained in:
parent
70483bdd3d
commit
14dae2b11a
@ -255,15 +255,13 @@ rec {
|
|||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
gcc34 = (import ../build-support/gcc-wrapper) {
|
gcc33 = (import ../build-support/gcc-wrapper) {
|
||||||
nativeTools = false;
|
nativeTools = false;
|
||||||
nativeGlibc = false;
|
nativeGlibc = false;
|
||||||
gcc = (import ../development/compilers/gcc-3.4) {
|
gcc = (import ../development/compilers/gcc-3.3) {
|
||||||
inherit fetchurl stdenv noSysDirs;
|
inherit fetchurl stdenv noSysDirs;
|
||||||
profiledCompiler = true;
|
|
||||||
};
|
};
|
||||||
binutils = stdenv.gcc.binutils;
|
inherit (stdenv.gcc) binutils glibc;
|
||||||
glibc = stdenv.gcc.glibc;
|
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -273,8 +271,7 @@ rec {
|
|||||||
gcc = (import ../development/compilers/gcc-2.95) {
|
gcc = (import ../development/compilers/gcc-2.95) {
|
||||||
inherit fetchurl stdenv noSysDirs;
|
inherit fetchurl stdenv noSysDirs;
|
||||||
};
|
};
|
||||||
binutils = stdenv.gcc.binutils;
|
inherit (stdenv.gcc) binutils glibc;
|
||||||
glibc = stdenv.gcc.glibc;
|
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -287,8 +284,7 @@ rec {
|
|||||||
langF77 = true;
|
langF77 = true;
|
||||||
langCC = false;
|
langCC = false;
|
||||||
};
|
};
|
||||||
binutils = stdenv.gcc.binutils;
|
inherit (stdenv.gcc) binutils glibc;
|
||||||
glibc = stdenv.gcc.glibc;
|
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -457,7 +453,7 @@ rec {
|
|||||||
|
|
||||||
glibc = (import ../development/libraries/glibc) {
|
glibc = (import ../development/libraries/glibc) {
|
||||||
inherit fetchurl stdenv kernelHeaders;
|
inherit fetchurl stdenv kernelHeaders;
|
||||||
installLocales = false;
|
installLocales = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
aterm = (import ../development/libraries/aterm) {
|
aterm = (import ../development/libraries/aterm) {
|
||||||
|
Loading…
Reference in New Issue
Block a user