diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-05 22:27:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-05 22:34:34 +0200 |
| commit | f211b2af676751b66d1443e5371b92c9a98c8a0c (patch) | |
| tree | d138f84eff1a0477e99bf59748669b9449089d39 /gnu/packages/base.scm | |
| parent | 2ebe938c2f943232955df889a72a6280c412a649 (diff) | |
Revert "gnu: glibc: Honor 'GUIX_LOCPATH'."
This reverts commits fbb909ac7e947ebc8aea2c2efca7df3a78dfc3c4
and 2ebe938c2f943232955df889a72a6280c412a649.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c6abf56ebf..1250f51108 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -484,7 +484,6 @@ 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) @@ -615,13 +614,10 @@ store.") (native-search-paths ;; Search path for packages that provide locale data. This is useful - ;; primarily in build environments. Use 'GUIX_LOCPATH' rather than - ;; 'LOCPATH' to avoid interference with the host system's libc on foreign - ;; distros. + ;; primarily in build environments. (list (search-path-specification (variable "GUIX_LOCPATH") - (files (list (string-append "lib/locale/" version) - "lib/locale"))))) + (files '("lib/locale"))))) (synopsis "The GNU C Library") (description |