TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build-system: Use 'input-tuples->gexp' and 'outputs->gexp'.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2021-02-28 22:40:06 +01:00
parent f95fc73248
commit 6cd591155c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
5 changed files with 15 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/build-system/cargo.scm
View file

@ -114,13 +114,8 @@ (define builder
#: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))))))

14
guix/build-system/cmake.scm
View file

@ -204,20 +204,14 @@ (define builder
(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

14
guix/build-system/gnu.scm
View file

@ -510,20 +510,14 @@ (define builder
(use-modules #$@(sexp->gexp modules))
(define %build-host-inputs
(map (lambda (tuple)
(apply cons tuple))
'#+build-inputs))
#+(input-tuples->gexp build-inputs))
(define %build-target-inputs
(map (lambda (tuple)
(apply cons tuple))
(append '#$host-inputs '#+target-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))
(gnu-build #:source #+source
#:system #$system

9
guix/build-system/ocaml.scm
View file

@ -260,13 +260,8 @@ (define builder
(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

3
guix/gexp.scm
View file

@ -106,6 +106,9 @@ (define-module (guix gexp)
lowered-gexp-load-compiled-path
with-build-variables
input-tuples->gexp
outputs->gexp
gexp->derivation
gexp->file
gexp->script