diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-10 18:39:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-15 10:01:05 +0200 |
| commit | b9373e262730578ba6c3805ffe44900f10bc655c (patch) | |
| tree | c232d2f55b3afe50f415e386dd13ea44a65b4348 /guix/remote.scm | |
| parent | 93c2a0073945e8c3967cdb0e250d3341f7dcac71 (diff) | |
| download | guix-b9373e262730578ba6c3805ffe44900f10bc655c.tar guix-b9373e262730578ba6c3805ffe44900f10bc655c.tar.gz | |
gexp: 'lowered-gexp-guile' now returns a <derivation-input>.
* guix/derivations.scm (derivation-input-output-path): New procedure.
* guix/gexp.scm (lower-gexp): Wrap GUILE in a <derivation-input>.
(gexp->derivation): Adjust accordingly.
* guix/remote.scm (remote-pipe-for-gexp, remote-eval): Adjust
accordingly.
* tests/gexp.scm ("lower-gexp"): Adjust accordingly.
Diffstat (limited to 'guix/remote.scm')
| -rw-r--r-- | guix/remote.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/remote.scm b/guix/remote.scm index 52ced16871..d49ee91b38 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -46,7 +46,7 @@ (compose object->string object->string)) (apply open-remote-pipe* session OPEN_READ - (string-append (derivation->output-path + (string-append (derivation-input-output-path (lowered-gexp-guile lowered)) "/bin/guile") "--no-auto-compile" @@ -95,7 +95,7 @@ remote store." (remote -> (connect-to-remote-daemon session socket-name))) (define inputs - (cons (derivation-input (lowered-gexp-guile lowered)) + (cons (lowered-gexp-guile lowered) (lowered-gexp-inputs lowered))) (define sources |