summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorJohn Kehayias <john.kehayias@protonmail.com>2021-07-21 00:20:29 +0200
committerLars-Dominik Braun <lars@6xq.net>2021-10-08 09:13:46 +0200
commitfe56213027d9828c61fa06211458a23f32431e0b (patch)
tree4e02a0be3b74b46ec3d7833b8a53cbd7146a45a0 /guix
parent3fc0fa988eaaf73da8637dcd152e03749d2eec52 (diff)
downloadguix-patches-fe56213027d9828c61fa06211458a23f32431e0b.tar
guix-patches-fe56213027d9828c61fa06211458a23f32431e0b.tar.gz
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 <rekado@elephly.net>
Diffstat (limited to 'guix')
-rw-r--r--guix/build/haskell-build-system.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm
index 28253ce2f0..171100ecf7 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 <paul@denknerd.org>
;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; 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 '())