diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-03-07 15:26:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-30 22:48:45 +0200 |
| commit | a779363b6aa581e88eda21f9f35530962d54ac25 (patch) | |
| tree | 28170903848d874ff0665de64f0428220233b119 | |
| parent | 565733c4d71ebfa0f200d027de2ea663461c1bd3 (diff) | |
| download | guix-a779363b6aa581e88eda21f9f35530962d54ac25.tar.gz guix-a779363b6aa581e88eda21f9f35530962d54ac25.zip | |
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.
| -rw-r--r-- | guix/gexp.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index edd1224aa9..ab83c1e621 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))) |