~ruther/guix-local: build-system/linux-module: Wrap with build variables.

9f955a1cfd8f3b8fe066034878131f0e2518740b — Tobias Geerinckx-Rice 4 years ago 7166417

build-system/linux-module: Wrap with build variables.

* guix/build-system/linux-module.scm (linux-module-build): Wrap the
builder gexp WITH-BUILD-VARIABLES to restore %build-inputs after commit
7d873f194ca69d6096d28d7a224ab78e83e34fe1 removed all old certainties.

Reported by lfam in #guix.

patch browse .tar.gz .zip

1 files changed, 16 insertions(+), 15 deletions(-)

M guix/build-system/linux-module.scm

M guix/build-system/linux-module.scm => guix/build-system/linux-module.scm +16 -15

@@ 173,21 173,22 @@
     (with-imported-modules imported-modules
       #~(begin
           (use-modules #$@(sexp->gexp modules))
-          (linux-module-build #:name #$name
-                              #:source #+source
-                              #:source-directory #$source-directory
-                              #:search-paths '#$(sexp->gexp
-                                                 (map search-path-specification->sexp
-                                                      search-paths))
-                              #:phases #$phases
-                              #:system #$system
-                              #:target #$target
-                              #:arch #$(system->arch (or target system))
-                              #:tests? #$tests?
-                              #:outputs #$(outputs->gexp outputs)
-                              #:make-flags #$make-flags
-                              #:parallel-build? #$parallel-build?
-                              #:inputs #$(input-tuples->gexp inputs)))))
+          #$(with-build-variables inputs outputs
+              #~(linux-module-build #:name #$name
+                                    #:source #+source
+                                    #:source-directory #$source-directory
+                                    #:search-paths '#$(sexp->gexp
+                                                       (map search-path-specification->sexp
+                                                            search-paths))
+                                    #:phases #$phases
+                                    #:system #$system
+                                    #:target #$target
+                                    #:arch #$(system->arch (or target system))
+                                    #:tests? #$tests?
+                                    #:outputs #$(outputs->gexp outputs)
+                                    #:make-flags #$make-flags
+                                    #:parallel-build? #$parallel-build?
+                                    #:inputs #$(input-tuples->gexp inputs))))))
 
   (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
                                                   system #:graft? #f)))