TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build-system/haskell: Import build variables.

Browse source 
* guix/build-system/haskell.scm (haskell-build): Wrap in WITH-BUILD-VARIABLES
in order to get %build-inputs and friends.
This commit is contained in:
Marius Bakke 2021-06-19 16:50:51 +02:00
parent 68d280a512
commit e6ab2f0097
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
guix/build-system/haskell.scm
View file

@ -144,24 +144,25 @@ (define builder
#~(begin
(use-modules #$@(sexp->gexp modules))
(haskell-build #:name #$name
#:source #+source
#:cabal-revision #$(assoc-ref inputs
"cabal-revision")
#:configure-flags #$configure-flags
#:extra-directories #$extra-directories
#:haddock-flags #$haddock-flags
#:system #$system
#:test-target #$test-target
#:tests? #$tests?
#:parallel-build? #$parallel-build?
#:haddock? #$haddock?
#:phases #$phases
#:outputs #$(outputs->gexp outputs)
#:search-paths '#$(sexp->gexp
(map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs)))))
#$(with-build-variables inputs outputs
#~(haskell-build #:name #$name
#:source #+source
#:cabal-revision #$(assoc-ref inputs "cabal-revision")
#:configure-flags #$configure-flags
#:extra-directories #$extra-directories
#:extra-directories #$extra-directories
#:haddock-flags #$haddock-flags
#:system #$system
#:test-target #$test-target
#:tests? #$tests?
#:parallel-build? #$parallel-build?
#:haddock? #$haddock?
#:phases #$phases
#:outputs #$(outputs->gexp outputs)
#:search-paths '#$(sexp->gexp
(map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))