* Let's see how far we get with separate locales.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15158
This commit is contained in:
Eelco Dolstra 2009-04-19 16:07:00 +00:00
parent 35e42d3e5c
commit e1cfa22536
3 changed files with 5 additions and 3 deletions

View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
./nss-skip-unavail.patch ./nss-skip-unavail.patch
/* Make it possible to override the locale-archive in NixOS. */ /* Make it possible to override the locale-archive in NixOS. */
# ./locale-override.patch ./locale-override.patch
]; ];
# `--with-tls --without-__thread' enables support for TLS but causes # `--with-tls --without-__thread' enables support for TLS but causes

View File

@ -3049,10 +3049,10 @@ let
glibc29 = import ../development/libraries/glibc-2.9 { glibc29 = import ../development/libraries/glibc-2.9 {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv kernelHeaders;
installLocales = getPkgConfig "glibc" "locales" true; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibcLocales = import ../development/libraries/glibc-2.9/locales.nix { glibcLocales = makeOverridable (import ../development/libraries/glibc-2.9/locales.nix) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };

View File

@ -126,6 +126,8 @@ in {
ghostscriptX = linux; ghostscriptX = linux;
gimp = linux; gimp = linux;
git = linux; git = linux;
glibc = linux;
glibcLocales = linux;
gnash = linux; gnash = linux;
gnugrep = all; gnugrep = all;
gnum4 = all; gnum4 = all;