me
/
guix
Archived
1
0
Fork 0
Code

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
7d873f194c removed all old certainties.

Reported by lfam in #guix.
master
Tobias Geerinckx-Rice 2021-12-15 04:56:00 +01:00
parent 7166417ea6
commit 9f955a1cfd
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
guix/build-system/linux-module.scm
View File

@ -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)))