me
/
guix
Archived
1
0
Fork 0
Code

build-system/haskell: Import build variables. 

* guix/build-system/haskell.scm (haskell-build): Wrap in WITH-BUILD-VARIABLES
in order to get %build-inputs and friends.
master
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 @@ provides a 'Setup.hs' file as its build system."
#~(begin #~(begin
(use-modules #$@(sexp->gexp modules)) (use-modules #$@(sexp->gexp modules))
(haskell-build #:name #$name #$(with-build-variables inputs outputs
#:source #+source #~(haskell-build #:name #$name
#:cabal-revision #$(assoc-ref inputs #:source #+source
"cabal-revision") #:cabal-revision #$(assoc-ref inputs "cabal-revision")
#:configure-flags #$configure-flags #:configure-flags #$configure-flags
#:extra-directories #$extra-directories #:extra-directories #$extra-directories
#:haddock-flags #$haddock-flags #:extra-directories #$extra-directories
#:system #$system #:haddock-flags #$haddock-flags
#:test-target #$test-target #:system #$system
#:tests? #$tests? #:test-target #$test-target
#:parallel-build? #$parallel-build? #:tests? #$tests?
#:haddock? #$haddock? #:parallel-build? #$parallel-build?
#:phases #$phases #:haddock? #$haddock?
#:outputs #$(outputs->gexp outputs) #:phases #$phases
#:search-paths '#$(sexp->gexp #:outputs #$(outputs->gexp outputs)
(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths)) (map search-path-specification->sexp
#:inputs #$(input-tuples->gexp inputs))))) search-paths))
#: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)))