guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: build-system/asdf: Don't fail in sbcl-package->cl-source-package


From: guix-commits
Subject: 01/02: build-system/asdf: Don't fail in sbcl-package->cl-source-package on non-package inputs.
Date: Fri, 19 Nov 2021 05:09:59 -0500 (EST)

ambrevar pushed a commit to branch master
in repository guix.

commit 56db786591f14488656b099aef04539a90821993
Author: Pierre Neidhardt <mail@ambrevar.xyz>
AuthorDate: Wed Nov 17 09:09:42 2021 +0100

    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 b4e40ee..4edf685 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]