From 3e43c64a74cc48553a723bc14f17578f585502e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 1 Jul 2012 17:32:03 +0200
Subject: [PATCH] build-system/gnu: Make the builder's module list a parameter.
* guix/build-system/gnu.scm (gnu-build): Add a `modules' keyword
parameter; use it.
---
guix/build-system/gnu.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index acda54e9e77..0f931dc582b 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -44,12 +44,14 @@ (define %standard-inputs
(define* (gnu-build store name source inputs
#:key (outputs '("out")) (configure-flags ''())
(make-flags ''()) (phases '%standard-phases)
- (system (%current-system)))
+ (system (%current-system))
+ (modules '((guix build gnu-build-system)
+ (guix build utils))))
"Return a derivation called NAME that builds from tarball SOURCE, with
input derivation INPUTS, using the usual procedure of the GNU Build System."
(define builder
`(begin
- (use-modules (guix build gnu-build-system))
+ (use-modules ,@modules)
(gnu-build #:source ,(if (derivation-path? source)
(derivation-path->output-path source)
source)
@@ -65,8 +67,7 @@ (define builder
,@inputs
,@%standard-inputs)
#:outputs outputs
- #:modules '((guix build gnu-build-system)
- (guix build utils))))
+ #:modules modules))
(define gnu-build-system
(build-system (name 'gnu)
--
GitLab