summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-06-19 16:50:51 +0200
committerMarius Bakke <marius@gnu.org>2021-06-19 17:08:37 +0200
commite6ab2f009762c727d651bc3ccf66605192a448a5 (patch)
tree8e76b23d0371fee52881853c6fcc0ac6b0829070 /guix/build-system
parent68d280a512136b1a144c50e2363122952a9ebde4 (diff)
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.
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/haskell.scm37
1 files changed, 19 insertions, 18 deletions
diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm
index 67c8593cf6..bd5a6eed48 100644
--- a/guix/build-system/haskell.scm
+++ b/guix/build-system/haskell.scm
@@ -144,24 +144,25 @@ provides a 'Setup.hs' file as its build system."
#~(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)))