29/29: gexp: Allowed/disallowed references and graphs never refer to grafted inputs.

[guix-commits]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit 61e90416ac99e4fbf3c684d2150209d1d47cf547
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Mar 7 15:26:47 2021 +0100

    gexp: Allowed/disallowed references and graphs never refer to grafted 
inputs.
    
    * guix/gexp.scm (lower-reference-graphs, lower-references): Wrap
    'lower-object' call in 'without-grafting' since these things never refer
    to grafted inputs.
---
 guix/gexp.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index ded205f..b8a9d33 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -887,8 +887,9 @@ corresponding <derivation-input> or store item."
 
   (match graphs
     (((file-names . inputs) ...)
-     (mlet %store-monad ((inputs (lower-inputs (map tuple->gexp-input inputs)
-                                               system target)))
+     (mlet %store-monad ((inputs (without-grafting
+                                  (lower-inputs (map tuple->gexp-input inputs)
+                                                system target))))
        (return (map cons file-names inputs))))))
 
 (define* (lower-references lst #:key system target)
@@ -901,13 +902,15 @@ names and file names suitable for the 
#:allowed-references argument to
        ((? string? output)
         (return output))
        (($ <gexp-input> thing output native?)
-        (mlet %store-monad ((drv (lower-object thing system
-                                               #:target (if native?
-                                                            #f target))))
+        (mlet %store-monad ((drv (without-grafting
+                                  (lower-object thing system
+                                                #:target (if native?
+                                                             #f target)))))
           (return (derivation->output-path drv output))))
        (thing
-        (mlet %store-monad ((drv (lower-object thing system
-                                               #:target target)))
+        (mlet %store-monad ((drv (without-grafting
+                                  (lower-object thing system
+                                                #:target target))))
           (return (derivation->output-path drv))))))
 
     (mapm/accumulate-builds lower lst)))