Catch and ignore the new cross build derivation errors

This commit is contained in:
Christopher Baines 2024-07-18 13:58:21 +01:00
parent b22834dae7
commit 0ca9c3f64f

View file

@ -473,6 +473,10 @@
'misc-error 'misc-error
(lambda () (lambda ()
(guard (c ((package-cross-build-system-error? c) (guard (c ((package-cross-build-system-error? c)
#f)
((package-unsupported-target-error? c)
#f)
((unsupported-cross-compilation-target-error? c)
#f)) #f))
(let ((derivation (let ((derivation
(if target (if target
@ -579,6 +583,17 @@
(use-modules (guix platform))) (use-modules (guix platform)))
inf) inf)
(unless (inferior-eval
'(defined? 'package-unsupported-target-error?
(resolve-module '(guix packages)))
inf)
(inferior-eval
'(define package-unsupported-target-error? (const #f))
inf)
(inferior-eval
'(define unsupported-cross-compilation-target-error? (const #f))
inf))
(format (current-error-port) (format (current-error-port)
"heap size: ~a MiB~%" "heap size: ~a MiB~%"
(round (round