summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-12-15 04:56:00 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-12-15 04:57:05 +0100
commit9f955a1cfd8f3b8fe066034878131f0e2518740b (patch)
tree012e3cde0a606c76a5e7306a8d201642a6ec7fc1 /guix/build-system
parent7166417ea6d59690617eb184b8cc95d9a11edcc3 (diff)
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.
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/linux-module.scm31
1 files changed, 16 insertions, 15 deletions
diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm
index 0eab919deb..57fce8e96e 100644
--- a/guix/build-system/linux-module.scm
+++ b/guix/build-system/linux-module.scm
@@ -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)))