guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 01/24: guix: haskell-build-system: Always pass -package-db option.
Date: Fri, 8 Oct 2021 03:20:29 -0400 (EDT)

lbraun pushed a commit to branch master
in repository guix.

commit fe56213027d9828c61fa06211458a23f32431e0b
Author: John Kehayias <john.kehayias@protonmail.com>
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 <rekado@elephly.net>
---
 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 <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 '())



reply via email to

[Prev in Thread] Current Thread [Next in Thread]