diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-04 09:59:56 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:19 +0200 |
| commit | 905256af761d6d4190de98b2791e875db433d1f2 (patch) | |
| tree | abc61c7d87f9b2790ea9a2635d764a70577e3d8f | |
| parent | 2301a580e546abdc0beec65aeb250659d7b0ba5d (diff) | |
| download | guix-905256af761d6d4190de98b2791e875db433d1f2.tar.gz guix-905256af761d6d4190de98b2791e875db433d1f2.zip | |
build: agda-build-system: Do not rely on "locales" being present.
A "locales" package is no longer included in the 'standard-packages'
collection, per commit de9d6d12 (gnu: commencement: Remove
‘glibc-utf8-locales’ from ‘%final-inputs’."), which is made because glibc now
embeds a C.UTF8 locale.
* guix/build-system/agda.scm (lower): Remove "locales" implicit input.
* guix/build/agda-build-system.scm (set-locpath): Do not fail when a locales
package is not available.
Change-Id: If14e074e457c625960d70fcaf46c7e829d5d58d1
| -rw-r--r-- | guix/build-system/agda.scm | 1 | ||||
| -rw-r--r-- | guix/build/agda-build-system.scm | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guix/build-system/agda.scm b/guix/build-system/agda.scm index 409d0cda9d..ec6ad860e0 100644 --- a/guix/build-system/agda.scm +++ b/guix/build-system/agda.scm @@ -69,7 +69,6 @@ (list "ghc" (default-haskell)) (standard-packages)) '()) - ,(assoc "locales" (standard-packages)) ,@native-inputs)) (outputs outputs) (build agda-build) diff --git a/guix/build/agda-build-system.scm b/guix/build/agda-build-system.scm index 49836d5dea..8770710b90 100644 --- a/guix/build/agda-build-system.scm +++ b/guix/build/agda-build-system.scm @@ -29,7 +29,8 @@ (define* (set-locpath #:key inputs native-inputs #:allow-other-keys) (let ((locales (assoc-ref (or native-inputs inputs) "locales"))) - (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale")))) + (when locales + (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale"))))) (define %agda-possible-extensions (cons |