[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build-system/scons: Use 'with-build-variables'.
From: |
guix-commits |
Subject: |
02/02: build-system/scons: Use 'with-build-variables'. |
Date: |
Wed, 31 Mar 2021 08:41:11 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit b702d1219c4a7e01975a4cc442ed14b3139aeae8
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Mar 31 14:06:17 2021 +0200
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'.
---
guix/build-system/scons.scm | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm
index 7cc0c39..74901b3 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