From 6cd591155c10aa3cbc33d9e219dee9d948fda54e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Feb 2021 22:40:06 +0100 Subject: 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. --- guix/build-system/ocaml.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'guix/build-system/ocaml.scm') diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 2f60f0d534..e7d6d96f0e 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -260,13 +260,8 @@ provides a 'setup.ml' file as its build system." (use-modules #$@modules) (ocaml-build #:source #$source #:system #$system - #: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 '#$(map search-path-specification->sexp search-paths) #:phases #$phases -- cgit v1.2.3