diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-01-20 01:57:07 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-01-24 11:18:49 -0500 |
| commit | 6d5a65de7fba53ca1160844550d261f540f110e1 (patch) | |
| tree | 3aec05f486f3d3719415f5461b345df07b524b30 /gnu/system/locale.scm | |
| parent | 78dfc1613938fb9f975de8d61302f44be86df324 (diff) | |
| download | guix-patches-6d5a65de7fba53ca1160844550d261f540f110e1.tar guix-patches-6d5a65de7fba53ca1160844550d261f540f110e1.tar.gz | |
system: Put locales where libc will find them.
* gnu/system/locale.scm (localedef-command, single-locale-directory): Use only
the major+minor part of the libc version number in the locale directory name.
Diffstat (limited to 'gnu/system/locale.scm')
| -rw-r--r-- | gnu/system/locale.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 75cb855b59..75417f6698 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module (guix store) #:use-module (guix records) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (srfi srfi-26) @@ -90,9 +92,9 @@ or #f on failure." "--no-archive" "--prefix" #$output "-i" #$(locale-definition-source locale) "-f" #$(locale-definition-charset locale) - (string-append #$output "/" - #$(package-version libc) "/" - #$(locale-definition-name locale)))))) + (string-append #$output "/" #$(version-major+minor + (package-version libc)) + "/" #$(locale-definition-name locale)))))) (define* (single-locale-directory locales #:key (libc (canonical-package glibc))) @@ -102,7 +104,7 @@ Because locale data formats are incompatible when switching from one libc to another, locale data is put in a sub-directory named after the 'version' field of LIBC." (define version - (package-version libc)) + (version-major+minor (package-version libc))) (define build #~(begin |