From 2d261d1c1ed28e396ec0305075ccffb25b416abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 4 Apr 2010 18:05:58 +0000 Subject: [PATCH] Making glibc-2.11.1 search the locale archive not in LOCALE_ARCHIVE, but LOCALE_ARCHIVE_2_11 Then, next updates of glibc versions should involve also a change in the LOCALE_ARCHIVE_X_XX variable name, and this way nixos would deal properly with locales and old-glibc packages. I welcome other solutions. This looks simple enough, so that's why I go on it. svn path=/nixpkgs/branches/stdenv-updates/; revision=20944 --- pkgs/development/libraries/glibc-2.11/locale-override.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.11/locale-override.patch b/pkgs/development/libraries/glibc-2.11/locale-override.patch index 108d0e35dac..72340993c33 100644 --- a/pkgs/development/libraries/glibc-2.11/locale-override.patch +++ b/pkgs/development/libraries/glibc-2.11/locale-override.patch @@ -11,7 +11,7 @@ diff -rc glibc-2.9-20081208-orig/locale/loadarchive.c glibc-2.9-20081208/locale/ + open_locale_archive () + { + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE"); ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); + if (path) + fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); + if (fd < 0) @@ -66,7 +66,7 @@ diff -rc glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h glibc-2.9-20081208/ "LD_SHOW_AUXV\0" \ "LD_USE_LOAD_BIAS\0" \ "LOCALDOMAIN\0" \ -+ "LOCALE_ARCHIVE\0" \ ++ "LOCALE_ARCHIVE_2_11\0" \ "LOCPATH\0" \ "MALLOC_TRACE\0" \ "NIS_PATH\0" \