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.
This commit is contained in:
Ludovic Courtès 2012-07-01 17:32:03 +02:00
parent b0e0d0e99f
commit 3e43c64a74

View file

@ -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)