~ruther/guix-local: build-system/gnu: Make the builder's module list a parameter.

3e43c64a74cc48553a723bc14f17578f585502e2 — Ludovic Courtès 13 years ago b0e0d0e

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.

patch browse .tar.gz

1 files changed, 5 insertions(+), 4 deletions(-)

M guix/build-system/gnu.scm

M guix/build-system/gnu.scm => guix/build-system/gnu.scm +5 -4

@@ 44,12 44,14 @@
 (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 @@ input derivation INPUTS, using the usual procedure of the GNU Build System."
                                   ,@inputs
                                   ,@%standard-inputs)
                                 #:outputs outputs
-                                #:modules '((guix build gnu-build-system)
-                                            (guix build utils))))
+                                #:modules modules))
 
 (define gnu-build-system
   (build-system (name 'gnu)