diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-12-16 23:14:56 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-12-16 23:14:56 -0500 |
| commit | 17c3a3bfff150a42c904233fa39818d73c9f68f3 (patch) | |
| tree | a7614b7cd9a7106ea59f5ac1caad0c2c496b3a45 /guix/scripts/pack.scm | |
| parent | f5493629e2650c0d30caf0f01f76b2383f78b9de (diff) | |
| parent | fe86819d8bde674766659c22b215d3a689a8026e (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I0c6e2410c51335c68634738be030e374f5b492e9
Diffstat (limited to 'guix/scripts/pack.scm')
| -rw-r--r-- | guix/scripts/pack.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index bdbea49910..8071840de1 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -137,7 +137,8 @@ dependencies are registered." ;; Make sure non-ASCII file names are properly handled. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append (libc-utf8-locales-for-target (%current-system)) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8") (sql-schema #$schema) @@ -209,7 +210,10 @@ GLIBC-UT8-LOCALES package." (profile-locales? profile)) #~(begin (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append (let-system (system target) + (libc-utf8-locales-for-target + (or target system))) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8")) #~(setenv "GUIX_LOCPATH" "unset for tests"))) |