lbraun pushed a commit to branch wip-haskell
in repository guix.
commit 14dd3fabe7c5b641b621d4042ac4ee9f9329c1a8
Author: John Kehayias <[email protected]>
AuthorDate: Wed Jul 21 00:20:29 2021 +0200
guix: haskell-build-system: Always pass -package-db option.
* guix/build/haskell-build-system.scm (run-setuphs): Pass -package-db
option.
Signed-off-by: Ricardo Wurmus <[email protected]>
---
guix/build/haskell-build-system.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/build/haskell-build-system.scm
b/guix/build/haskell-build-system.scm
index 28253ce..171100e 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Paul van der Walt <[email protected]>
;;; Copyright © 2018, 2020 Ricardo Wurmus <[email protected]>
;;; Copyright © 2018 Alex Vong <[email protected]>
+;;; Copyright © 2021 John Kehayias <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -63,13 +64,14 @@
((file-exists? "Setup.lhs")
"Setup.lhs")
(else
- #f))))
+ #f)))
+ (pkgdb (string-append "-package-db=" %tmp-db-dir)))
(if setup-file
(begin
(format #t "running \"runhaskell Setup.hs\" with command ~s \
and parameters ~s~%"
command params)
- (apply invoke "runhaskell" setup-file command params))
+ (apply invoke "runhaskell" pkgdb setup-file command params))
(error "no Setup.hs nor Setup.lhs found"))))
(define* (configure #:key outputs inputs tests? (configure-flags '())
