guix-commits
[Top][All Lists]
Advanced

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

branch core-updates updated: gexp: 'compiled-modules' honors extensions.


From: guix-commits
Subject: branch core-updates updated: gexp: 'compiled-modules' honors extensions.
Date: Wed, 31 Mar 2021 05:55:38 -0400

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new bfd17ec  gexp: 'compiled-modules' honors extensions.
bfd17ec is described below

commit bfd17ecddd12d8098e2cbd4b38f2ae7c2eeed1ce
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Mar 31 11:54:12 2021 +0200

    gexp: 'compiled-modules' honors extensions.
    
    Fixes a regression introduced in
    2eafeb2f3d661061bc412c3f27c90202e4532532 whereby extensions would not be
    added as inputs of the resulting derivation.
    
    * guix/gexp.scm (compiled-modules): Append EXTENSIONS to the second
    argument of 'gexp-with-hidden-inputs'.
---
 guix/gexp.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 77ef2a4..3d8c2b9 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1764,7 +1764,8 @@ TARGET, a GNU triplet."
 
           (load-from-directory ".")
           (process-directory "." (ungexp output) 0)))
-       (list (gexp-input modules))))
+       (append (map gexp-input extensions)
+               (list (gexp-input modules)))))
 
     (gexp->derivation name build
                       #:script-name "compile-modules"



reply via email to

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