diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-02-28 22:40:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-30 22:48:44 +0200 |
| commit | 6cd591155c10aa3cbc33d9e219dee9d948fda54e (patch) | |
| tree | 2c990c4d90480a826a8acf96b44eca4ae68a5405 /guix/build-system/cargo.scm | |
| parent | f95fc73248e81a65e84798a344e0c781c1121f76 (diff) | |
build-system: Use 'input-tuples->gexp' and 'outputs->gexp'.
* guix/gexp.scm (input-tuples->gexp, outputs->gexp): Make public.
* guix/build-system/cargo.scm (cargo-build): Use them.
* guix/build-system/gnu.scm (gnu-cross-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/cmake.scm (cmake-cross-build): Likewise.
Diffstat (limited to 'guix/build-system/cargo.scm')
| -rw-r--r-- | guix/build-system/cargo.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 0af0ce0233..60c35eed07 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -114,13 +114,8 @@ to NAME and VERSION." #:phases #$(if (pair? phases) (sexp->gexp phases) phases) - #:outputs (list #$@(map (lambda (name) - #~(cons #$name - (ungexp output name))) - outputs)) - #:inputs (map (lambda (tuple) - (apply cons tuple)) - '#$inputs) + #:outputs #$(outputs->gexp outputs) + #:inputs #$(input-tuples->gexp inputs) #:search-paths '#$(sexp->gexp (map search-path-specification->sexp search-paths)))))) |