diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/glibc-guix-locpath.patch | 34 |
2 files changed, 39 insertions, 2 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1b4233420f..5fa8beb26a 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -484,6 +484,7 @@ store.") (patches (map search-patch '("glibc-ldd-x86_64.patch" "glibc-locale-incompatibility.patch" + "glibc-guix-locpath.patch" "glibc-o-largefile.patch"))))) (build-system gnu-build-system) @@ -614,9 +615,11 @@ store.") (native-search-paths ;; Search path for packages that provide locale data. This is useful - ;; primarily in build environments. + ;; primarily in build environments. Use 'GUIX_LOCPATH' rather than + ;; 'LOCPATH' to avoid interference with the host system's libc on foreign + ;; distros. (list (search-path-specification - (variable "LOCPATH") + (variable "GUIX_LOCPATH") (files '("lib/locale"))))) (synopsis "The GNU C Library") diff --git a/gnu/packages/patches/glibc-guix-locpath.patch b/gnu/packages/patches/glibc-guix-locpath.patch new file mode 100644 index 0000000000..69bb2e50de --- /dev/null +++ b/gnu/packages/patches/glibc-guix-locpath.patch @@ -0,0 +1,34 @@ +Honor a special 'GUIX_LOCPATH' environment variable. + +This is most useful when using Guix on top of another distro, which uses an +different libc version with incompatible locale data. In this case, setting +'GUIX_LOCPATH' rather than 'LOCPATH' allows users to tell Guix's libc where to +look for its locale data without breaking programs that use the other libc. + +See <https://lists.gnu.org/archive/html/guix-devel/2015-09/msg00717.html> for +some background information. + +--- a/locale/newlocale.c ++++ b/locale/newlocale.c +@@ -103,6 +103,8 @@ __newlocale (int category_mask, const char *locale, __locale_t base) + locale_path_len = 0; + + locpath_var = getenv ("LOCPATH"); ++ if (locpath_var == NULL || locpath_var[0] == '\0') ++ locpath_var = getenv ("GUIX_LOCPATH"); + if (locpath_var != NULL && locpath_var[0] != '\0') + { + if (__argz_create_sep (locpath_var, ':', +diff --git a/locale/setlocale.c b/locale/setlocale.c +index ead030d..0e66c7b 100644 +--- a/locale/setlocale.c ++++ b/locale/setlocale.c +@@ -252,6 +252,8 @@ setlocale (int category, const char *locale) + locale_path_len = 0; + + locpath_var = getenv ("LOCPATH"); ++ if (locpath_var == NULL || locpath_var[0] == '\0') ++ locpath_var = getenv ("GUIX_LOCPATH"); + if (locpath_var != NULL && locpath_var[0] != '\0') + { + if (__argz_create_sep (locpath_var, ':', |