[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build: agda-build-system: Do not rely on "locales" being present.
From: |
guix-commits |
Subject: |
02/02: build: agda-build-system: Do not rely on "locales" being present. |
Date: |
Thu, 4 Jan 2024 10:07:04 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit e304e9e708e120f981c6a242bdba3701abab9b3c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Jan 4 09:59:56 2024 -0500
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
---
guix/build-system/agda.scm | 1 -
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