02/08: build-system/haskell: Import build variables.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit e6ab2f009762c727d651bc3ccf66605192a448a5
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 19 16:50:51 2021 +0200

    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.
---
 guix/build-system/haskell.scm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm
index 67c8593..bd5a6ee 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)))