diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-11-26 11:16:05 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-11-26 11:16:05 +0100 |
commit | 97e11209032cb10a40c588c66ebe9f345a85f234 (patch) | |
tree | d8496c524972f3289629b9c733c405d9f022c554 /gnu/packages/base.scm | |
parent | c4a298c52c8c8e80f0f08619ea171e6ad23e3654 (diff) | |
download | guix-97e11209032cb10a40c588c66ebe9f345a85f234.tar.gz |
gnu: glibc: Do not install all the locales.
* gnu/packages/base.scm (glibc)[outputs]: Remove "locales". [arguments]: Remove --localedir argument. Change libc_cv_localedir value to "/run/current-system/locale". Remove 'install-locales' phase.
Diffstat (limited to 'gnu/packages/base.scm')
-rw-r--r-- | gnu/packages/base.scm | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 39da8f87e9..e2ec52a45b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -381,25 +381,27 @@ included.") ;; users should automatically pull Linux headers as well. (propagated-inputs `(("linux-headers" ,linux-libre-headers))) - ;; Store the locales separately (~100 MiB). Note that "out" retains a - ;; reference to them anyway, so there's no space savings here. - ;; TODO: Eventually we may want to add a $LOCALE_ARCHIVE search path like - ;; Nixpkgs does. - (outputs '("out" "locales" "debug")) + (outputs '("out" "debug")) (arguments `(#:out-of-source? #t #:configure-flags (list "--enable-add-ons" "--sysconfdir=/etc" - (string-append "--localedir=" (assoc-ref %outputs "locales") - "/share/locale") + ;; Installing a locale archive with all the locales is to + ;; expensive (~100 MiB), so we rely on users to install the + ;; locales they really want. + ;; + ;; 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, with + ;; the idea that it is going to be populated by the sysadmin. + ;; ;; `--localedir' is not honored, so work around it. ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>. - (string-append "libc_cv_localedir=" - (assoc-ref %outputs "locales") - "/share/locale") + (string-append "libc_cv_localedir=/run/current-system/locale") (string-append "--with-headers=" (assoc-ref %build-inputs "linux-headers") @@ -476,11 +478,7 @@ included.") "") (("exec @PERL@") "exec perl")))) - (alist-cons-after - 'install 'install-locales - (lambda _ - (zero? (system* "make" "localedata/install-locales"))) - %standard-phases)))) + %standard-phases))) (inputs `(("static-bash" ,(static-package bash-light)))) |