nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Leo Famulari 2016-08-02 22:24:02 -04:00
parent 2d558e31af
commit 9f58fe3d1c
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/base.scm
View File

@ -527,7 +527,7 @@ store.")
;; Set the default locale path. In practice, $LOCPATH may be ;; Set the default locale path. In practice, $LOCPATH may be
;; defined to point whatever locales users want. However, setuid ;; defined to point whatever locales users want. However, setuid
;; binaries don't honor $LOCPATH, so they'll instead look into ;; 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. ;; with the idea that it is going to be populated by the sysadmin.
;; The "X.Y" sub-directory is because locale data formats are ;; The "X.Y" sub-directory is because locale data formats are
;; incompatible across libc versions; see ;; incompatible across libc versions; see
@ -535,8 +535,7 @@ store.")
;; ;;
;; `--localedir' is not honored, so work around it. ;; `--localedir' is not honored, so work around it.
;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>. ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
;; FIXME: This hack no longer works on 2.23! (string-append "libc_cv_complocaledir=/run/current-system/locale/"
(string-append "libc_cv_localedir=/run/current-system/locale/"
,version) ,version)
(string-append "--with-headers=" (string-append "--with-headers="

7
gnu/system.scm
View File

@ -545,12 +545,7 @@ use 'plain-file' instead~%")
;; By default, applications that use D-Bus, such as Emacs, abort at startup ;; 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. ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal.
("DBUS_FATAL_WARNINGS" . "0") ("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")))
(define %setuid-programs (define %setuid-programs
;; Default set of setuid-root programs. ;; Default set of setuid-root programs.