me
/
guix
Archived
1
0
Fork 0
Code

grafts: Use the right locale package. 

This is a followup to b0715d7cd2, fixing
builds of grafts on i586-gnu.

* guix/grafts.scm (graft-derivation/shallow)[glibc-locales]: Choose
symbol as a function of ‘target-hurd?’.

Change-Id: I05e50c0ed74a64986a0cea9c6302d1b5592b898d
Ludovic Courtès 2023-12-03 00:00:18 +01:00
parent ab8612d99e
commit 3dda74a546
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/grafts.scm
View File

@ -22,7 +22,7 @@
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix combinators) #:use-module (guix combinators)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module ((guix utils) #:select (%current-system)) #:use-module ((guix utils) #:select (%current-system target-hurd?))
#:use-module (guix sets) #:use-module (guix sets)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -98,7 +98,9 @@ OUTPUTS of DRV. This procedure performs \"shallow\" grafting in that GRAFTS
are not recursively applied to dependencies of DRV." are not recursively applied to dependencies of DRV."
(define glibc-locales (define glibc-locales
(module-ref (resolve-interface '(gnu packages commencement)) (module-ref (resolve-interface '(gnu packages commencement))
'glibc-utf8-locales-final)) (if (target-hurd? system)
'glibc-utf8-locales-final/hurd
'glibc-utf8-locales-final)))
(define mapping (define mapping
;; List of store item pairs. ;; List of store item pairs.