* Let's see how far we get with separate locales.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15158
This commit is contained in:
parent
35e42d3e5c
commit
e1cfa22536
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
./nss-skip-unavail.patch
|
||||
|
||||
/* 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
|
||||
|
@ -3049,10 +3049,10 @@ let
|
||||
|
||||
glibc29 = import ../development/libraries/glibc-2.9 {
|
||||
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;
|
||||
};
|
||||
|
||||
|
@ -126,6 +126,8 @@ in {
|
||||
ghostscriptX = linux;
|
||||
gimp = linux;
|
||||
git = linux;
|
||||
glibc = linux;
|
||||
glibcLocales = linux;
|
||||
gnash = linux;
|
||||
gnugrep = all;
|
||||
gnum4 = all;
|
||||
|
Loading…
Reference in New Issue
Block a user