summary refs log tree commit diff
diff options
context:
space:
mode:
authorPierre Neidhardt <mail@ambrevar.xyz>2021-11-17 09:09:42 +0100
committerPierre Neidhardt <mail@ambrevar.xyz>2021-11-19 11:06:50 +0100
commit56db786591f14488656b099aef04539a90821993 (patch)
treed5d2a51937b67307d47356564afdfb1fe3ef716a
parentad9b5cd19bfd44fdbce2f279a50886a90df29262 (diff)
downloadguix-56db786591f14488656b099aef04539a90821993.tar.gz
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.
-rw-r--r--guix/build-system/asdf.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm
index b4e40ee8c2..4edf6857b5 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))