amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: agda-build-system: Do not rely on "locales" being present.

Browse source 
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
This commit is contained in:
Maxim Cournoyer 2024-01-04 09:59:56 -05:00 • committed by Ludovic Courtès
parent 2301a580e5
commit 905256af76
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
guix/build-system/agda.scm
View file

@ -69,7 +69,6 @@
(list "ghc" (default-haskell)) (list "ghc" (default-haskell))
(standard-packages)) (standard-packages))
'()) '())
,(assoc "locales" (standard-packages))
,@native-inputs)) ,@native-inputs))
(outputs outputs) (outputs outputs)
(build agda-build) (build agda-build)

3
guix/build/agda-build-system.scm
View file

@ -29,7 +29,8 @@
(define* (set-locpath #:key inputs native-inputs #:allow-other-keys) (define* (set-locpath #:key inputs native-inputs #:allow-other-keys)
(let ((locales (assoc-ref (or native-inputs inputs) "locales"))) (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 (define %agda-possible-extensions
(cons (cons