nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/build-system/gnu.scm
View File

@ -44,12 +44,14 @@
(define* (gnu-build store name source inputs (define* (gnu-build store name source inputs
#:key (outputs '("out")) (configure-flags ''()) #:key (outputs '("out")) (configure-flags ''())
(make-flags ''()) (phases '%standard-phases) (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 "Return a derivation called NAME that builds from tarball SOURCE, with
input derivation INPUTS, using the usual procedure of the GNU Build System." input derivation INPUTS, using the usual procedure of the GNU Build System."
(define builder (define builder
`(begin `(begin
(use-modules (guix build gnu-build-system)) (use-modules ,@modules)
(gnu-build #:source ,(if (derivation-path? source) (gnu-build #:source ,(if (derivation-path? source)
(derivation-path->output-path source) (derivation-path->output-path source)
source) source)
@ -65,8 +67,7 @@ input derivation INPUTS, using the usual procedure of the GNU Build System."
,@inputs ,@inputs
,@%standard-inputs) ,@%standard-inputs)
#:outputs outputs #:outputs outputs
#:modules '((guix build gnu-build-system) #:modules modules))
(guix build utils))))
(define gnu-build-system (define gnu-build-system
(build-system (name 'gnu) (build-system (name 'gnu)