diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-03-31 14:06:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-31 14:06:17 +0200 |
| commit | b702d1219c4a7e01975a4cc442ed14b3139aeae8 (patch) | |
| tree | 8f5ff23d04d18838b8d0a42637a8e0ac168c1adf /guix/build-system/scons.scm | |
| parent | 8886a96f7469beaf5a1710b84cbfec20b1f6c7a0 (diff) | |
| download | guix-patches-b702d1219c4a7e01975a4cc442ed14b3139aeae8.tar guix-patches-b702d1219c4a7e01975a4cc442ed14b3139aeae8.tar.gz | |
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'.
Diffstat (limited to 'guix/build-system/scons.scm')
| -rw-r--r-- | guix/build-system/scons.scm | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 7cc0c390b0..74901b3478 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -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 |