[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: system: Put locales where libc will find them.
From: |
Mark H. Weaver |
Subject: |
01/01: system: Put locales where libc will find them. |
Date: |
Wed, 24 Jan 2018 11:21:39 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 6d5a65de7fba53ca1160844550d261f540f110e1
Author: Mark H Weaver <address@hidden>
Date: Sat Jan 20 01:57:07 2018 -0500
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.
---
gnu/system/locale.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index 75cb855..75417f6 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 <address@hidden>
+;;; Copyright © 2018 Mark H Weaver <address@hidden>
;;;
;;; 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