From 56db786591f14488656b099aef04539a90821993 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 17 Nov 2021 09:09:42 +0100 Subject: [PATCH] build-system/asdf: Don't fail in sbcl-package->cl-source-package on non-package inputs. Inputs can be non-packages, for instance (origin ...). sbcl-package->cl-source-package used to fail if such inputs were present in the parent sbcl-* package. * guix/build-system/asdf.scm (package-with-build-system): Fix 'has-from-build-system?' function. --- guix/build-system/asdf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index b4e40ee8c2e6ebc17abf9ab3a2d3d376941589e6..4edf6857b5dd6096b671ffb94995ebfd92db8536 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -162,7 +162,8 @@ set up using CL source package conventions." name)) (define (has-from-build-system? pkg) - (eq? from-build-system (package-build-system pkg))) + (and (package? pkg) + (eq? from-build-system (package-build-system pkg)))) (define (find-input-package pkg) (let* ((name (package-name pkg))