diff options
| author | Leo Famulari <leo@famulari.name> | 2016-08-02 22:24:02 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-08-10 15:41:21 -0400 |
| commit | 9f58fe3d1c32e3f0ced065e286532a10cad1b5e3 (patch) | |
| tree | 63b9a04ff14876970031ef5748cd37a34817d592 | |
| parent | 2d558e31af5c8207dc4149d2f5c468c6542b99b1 (diff) | |
| download | guix-9f58fe3d1c32e3f0ced065e286532a10cad1b5e3.tar.gz | |
gnu: glibc/linux: Adjust variable name to upstream change.
* gnu/packages/base.scm (glibc/linux)[arguments]: Change 'libc_cv_localedir' to 'libc_cv_complocaledir' in #:configure-flags. * gnu/system.scm: (operating-system-environment-variables): Remove 'GUIX_LOCPATH'.
| -rw-r--r-- | gnu/packages/base.scm | 5 | ||||
| -rw-r--r-- | gnu/system.scm | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a476837102..4d5ab4bc41 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -527,7 +527,7 @@ store.") ;; Set the default locale path. In practice, $LOCPATH may be ;; defined to point whatever locales users want. However, setuid ;; binaries don't honor $LOCPATH, so they'll instead look into - ;; $libc_cv_localedir; we choose /run/current-system/locale/X.Y, + ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y, ;; with the idea that it is going to be populated by the sysadmin. ;; The "X.Y" sub-directory is because locale data formats are ;; incompatible across libc versions; see @@ -535,8 +535,7 @@ store.") ;; ;; `--localedir' is not honored, so work around it. ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>. - ;; FIXME: This hack no longer works on 2.23! - (string-append "libc_cv_localedir=/run/current-system/locale/" + (string-append "libc_cv_complocaledir=/run/current-system/locale/" ,version) (string-append "--with-headers=" diff --git a/gnu/system.scm b/gnu/system.scm index d6bf6c413c..04dd7a845c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -545,12 +545,7 @@ use 'plain-file' instead~%") ;; By default, applications that use D-Bus, such as Emacs, abort at startup ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. - ("DBUS_FATAL_WARNINGS" . "0") - - ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 package - ;; looks things up in 'PREFIX/lib/locale' instead of - ;; '/run/current-system/locale' as was intended. - ("GUIX_LOCPATH" . "/run/current-system/locale"))) + ("DBUS_FATAL_WARNINGS" . "0"))) (define %setuid-programs ;; Default set of setuid-root programs. |