ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 23:32:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: haskell-build-system: Always pass -package-db option.

Browse source 
* guix/build/haskell-build-system.scm (run-setuphs): Pass -package-db option.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
This commit is contained in:
John Kehayias 2021-07-21 00:20:29 +02:00 committed by Lars-Dominik Braun
parent 3fc0fa988e
commit fe56213027
No known key found for this signature in database
GPG key ID: F663943E08D8092A
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/build/haskell-build-system.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -63,13 +64,14 @@ (define (run-setuphs command params)
((file-exists? "Setup.lhs") ((file-exists? "Setup.lhs")
"Setup.lhs") "Setup.lhs")
(else (else
#f)))) #f)))
(pkgdb (string-append "-package-db=" %tmp-db-dir)))
(if setup-file (if setup-file
(begin (begin
(format #t "running \"runhaskell Setup.hs\" with command ~s \ (format #t "running \"runhaskell Setup.hs\" with command ~s \
and parameters ~s~%" and parameters ~s~%"
command params) 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")))) (error "no Setup.hs nor Setup.lhs found"))))
(define* (configure #:key outputs inputs tests? (configure-flags '()) (define* (configure #:key outputs inputs tests? (configure-flags '())