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 #~(begin
(use-modules #$@(sexp->gexp modules)) (use-modules #$@(sexp->gexp modules))
(scons-build #:name #$name #$(with-build-variables inputs outputs
#:source #+source #~(scons-build #:name #$name
#:scons-flags #$(sexp->gexp scons-flags) #:source #+source
#:system #$system #:scons-flags #$(sexp->gexp scons-flags)
#:build-targets #$build-targets #:system #$system
#:test-target #$test-target #:build-targets #$build-targets
#:tests? #$tests? #:test-target #$test-target
#:install-targets #$install-targets #:tests? #$tests?
#:phases #$(if (pair? phases) #:install-targets #$install-targets
(sexp->gexp phases) #:phases #$(if (pair? phases)
phases) (sexp->gexp phases)
#:outputs (list #$@(map (lambda (name) phases)
#~(cons #$name #:outputs %outputs
(ungexp output name))) #:inputs %build-inputs
outputs)) #:search-paths
#:inputs (map (lambda (tuple) '#$(sexp->gexp
(apply cons tuple)) (map search-path-specification->sexp
'#$inputs) search-paths)))))))
#:search-paths '#$(sexp->gexp
(map search-path-specification->sexp
search-paths))))))
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system