me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* 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.
This commit is contained in:
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 (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@(sexp->gexp modules)) (use-modules #$@(sexp->gexp modules))
(linux-module-build #:name #$name #$(with-build-variables inputs outputs
#:source #+source #~(linux-module-build #:name #$name
#:source-directory #$source-directory #:source #+source
#:search-paths '#$(sexp->gexp #:source-directory #$source-directory
(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths)) (map search-path-specification->sexp
#:phases #$phases search-paths))
#:system #$system #:phases #$phases
#:target #$target #:system #$system
#:arch #$(system->arch (or target system)) #:target #$target
#:tests? #$tests? #:arch #$(system->arch (or target system))
#:outputs #$(outputs->gexp outputs) #:tests? #$tests?
#:make-flags #$make-flags #:outputs #$(outputs->gexp outputs)
#:parallel-build? #$parallel-build? #:make-flags #$make-flags
#:inputs #$(input-tuples->gexp inputs))))) #:parallel-build? #$parallel-build?
#:inputs #$(input-tuples->gexp inputs))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))