diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-01 21:32:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-03 17:55:13 +0200 |
| commit | fbb909ac7e947ebc8aea2c2efca7df3a78dfc3c4 (patch) | |
| tree | 9544c52c5284af05bae138a42dd98f53768d2ef2 /gnu/packages/base.scm | |
| parent | 1668dfcd37174af13636a85c80df2f833e867387 (diff) | |
| download | guix-fbb909ac7e947ebc8aea2c2efca7df3a78dfc3c4.tar guix-fbb909ac7e947ebc8aea2c2efca7df3a78dfc3c4.tar.gz | |
gnu: glibc: Honor 'GUIX_LOCPATH'.
* gnu/packages/patches/glibc-guix-locpath.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/base.scm (glibc)[source]: Use it.
[native-search-paths]: Use 'GUIX_LOCPATH' instead of 'LOCPATH'.
* doc/guix.texi (Application Setup): Introduce the term "foreign
distro". Document 'GUIX_LOCPATH'.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 7 |
1 files changed, 5 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") |