[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: build-system/scons: Allow using a G-exp for scons-flags.
From: |
guix-commits |
Subject: |
01/08: build-system/scons: Allow using a G-exp for scons-flags. |
Date: |
Thu, 3 Nov 2022 13:49:27 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit fd83edf8a10940fa0a6175fab420690f0072ad91
Author: Timotej Lazar <timotej.lazar@araneo.si>
AuthorDate: Mon Oct 31 10:39:28 2022 +0100
build-system/scons: Allow using a G-exp for scons-flags.
* guix/build-system/scons.scm (scons-build): Only call sexp->gexp on
scons-flags when scons-flags is a pair.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
guix/build-system/scons.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm
index e38213e8e0..7a02fa8a0f 100644
--- a/guix/build-system/scons.scm
+++ b/guix/build-system/scons.scm
@@ -100,7 +100,9 @@ provides a 'SConstruct' file as its build system."
#$(with-build-variables inputs outputs
#~(scons-build #:name #$name
#:source #+source
- #:scons-flags #$(sexp->gexp scons-flags)
+ #:scons-flags #$(if (pair? scons-flags)
+ (sexp->gexp scons-flags)
+ scons-flags)
#:system #$system
#:build-targets #$build-targets
#:test-target #$test-target
- branch master updated (754f260753 -> 9560932ce0), guix-commits, 2022/11/03
- 04/08: gnu: strawberry: Remove trailing #t from phases and snippet., guix-commits, 2022/11/03
- 05/08: gnu: ccls: Update to 0.20210330., guix-commits, 2022/11/03
- 01/08: build-system/scons: Allow using a G-exp for scons-flags.,
guix-commits <=
- 02/08: gnu: endless-sky: Update to 0.9.16.1, use new package style., guix-commits, 2022/11/03
- 06/08: gnu: emacs-next: Update to 29.0.50-3.22e8a77., guix-commits, 2022/11/03
- 07/08: gnu: upx: Update to 4.0.0., guix-commits, 2022/11/03
- 08/08: gnu: Add python-eris., guix-commits, 2022/11/03
- 03/08: gnu: strawberry: Update to 1.0.10., guix-commits, 2022/11/03