mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
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.
This commit is contained in:
parent
565733c4d7
commit
a779363b6a
1 changed files with 10 additions and 7 deletions
|
@ -887,8 +887,9 @@ (define tuple->gexp-input
|
|||
|
||||
(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 @@ (define lower
|
|||
((? 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)))
|
||||
|
|
Loading…
Reference in a new issue