diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-12-03 00:00:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-12-03 23:55:08 +0100 |
| commit | 3dda74a546c7bc5576d5f1464c9c610204fb4b82 (patch) | |
| tree | 37a2b6135d54082e751af21bf9a39a9f5f96ea25 /guix/grafts.scm | |
| parent | ab8612d99eca5c25ecbefe026b04ed9f00e3f8b5 (diff) | |
| download | guix-3dda74a546c7bc5576d5f1464c9c610204fb4b82.tar guix-3dda74a546c7bc5576d5f1464c9c610204fb4b82.tar.gz | |
grafts: Use the right locale package.
This is a followup to b0715d7cd2a74bc231751f8afc9dffb2047501ac, 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
Diffstat (limited to 'guix/grafts.scm')
| -rw-r--r-- | guix/grafts.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/grafts.scm b/guix/grafts.scm index 48f4c212f7..f4df513daf 100644 --- a/guix/grafts.scm +++ b/guix/grafts.scm @@ -22,7 +22,7 @@ #:use-module (guix records) #:use-module (guix combinators) #: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 gexp) #: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." (define glibc-locales (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 ;; List of store item pairs. |