me
/
guix
Archived
1
0
Fork 0
Code

build-system/scons: Use 'with-build-variables'. 

This brings back the '%build-inputs' and '%outputs' global variables,
which some packages such as 'serf' expect.

* guix/build-system/scons.scm (scons-build): Use 'with-build-variables'.
master
Ludovic Courtès 2021-03-31 14:06:17 +02:00
parent 8886a96f74
commit b702d1219c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
guix/build-system/scons.scm
View File

@ -97,27 +97,24 @@ provides a 'SConstruct' file as its build system."
#~(begin
(use-modules #$@(sexp->gexp modules))
(scons-build #:name #$name
#:source #+source
#:scons-flags #$(sexp->gexp scons-flags)
#:system #$system
#:build-targets #$build-targets
#:test-target #$test-target
#:tests? #$tests?
#:install-targets #$install-targets
#: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)
#:search-paths '#$(sexp->gexp
(map search-path-specification->sexp
search-paths))))))
#$(with-build-variables inputs outputs
#~(scons-build #:name #$name
#:source #+source
#:scons-flags #$(sexp->gexp scons-flags)
#:system #$system
#:build-targets #$build-targets
#:test-target #$test-target
#:tests? #$tests?
#:install-targets #$install-targets
#:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:outputs %outputs
#:inputs %build-inputs
#:search-paths
'#$(sexp->gexp
(map search-path-specification->sexp
search-paths)))))))
(gexp->derivation name builder
#:system system