diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix index b5b030f7696..cbbb98159ca 100644 --- a/pkgs/development/libraries/glibc-2.9/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cbe3e60215..2f563302009 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7c769b84e80..0294c4c223d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -126,6 +126,8 @@ in { ghostscriptX = linux; gimp = linux; git = linux; + glibc = linux; + glibcLocales = linux; gnash = linux; gnugrep = all; gnum4 = all;