civodul pushed a commit to branch wip-build-systems-gexp in repository guix.
commit db4d1b1e08ef9c95b00e61352fb0fe3a530c7d2e Author: Ludovic Courtès <[email protected]> AuthorDate: Sun Mar 7 15:50:27 2021 +0100 squash! build-system: Use 'input-tuples->gexp' and 'outputs->gexp'. --- guix/build-system/cmake.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 4e58bf7..1ac9e98 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -204,20 +204,14 @@ build system." (use-modules #$@(sexp->gexp modules)) (define %build-host-inputs - (map (lambda (tuple) - (apply cons tuple)) - '#+(append build-inputs target-inputs))) + #+(input-tuples->gexp build-inputs)) (define %build-target-inputs - (map (lambda (tuple) - (apply cons tuple)) - '#$host-inputs)) + (append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs))) (define %outputs - (list #$@(map (lambda (name) - #~(cons #$name - (ungexp output name))) - outputs))) + #$(outputs->gexp outputs)) (cmake-build #:source #+source #:system #$system
