[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: build-system/linux-module: Wrap with build variab
From: |
guix-commits |
Subject: |
branch master updated: build-system/linux-module: Wrap with build variables. |
Date: |
Tue, 14 Dec 2021 22:57:20 -0500 |
This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 9f955a1 build-system/linux-module: Wrap with build variables.
9f955a1 is described below
commit 9f955a1cfd8f3b8fe066034878131f0e2518740b
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Dec 15 04:56:00 2021 +0100
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.
---
guix/build-system/linux-module.scm | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/guix/build-system/linux-module.scm
b/guix/build-system/linux-module.scm
index 0eab919..57fce8e 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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: build-system/linux-module: Wrap with build variables.,
guix-commits <=