From 54a80b58d4e49bd27c47d2cd57e641738852a81a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:39 +0100 Subject: [PATCH] gnu: gnucash: Activate database support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnucash.scm (gnucash)[inputs]: Add libdbi and libdbi-drivers. [arguments]: Remove '-DWITH_SQL=OFF' from 'configure-flags' and add 'GNC_DBD_DIR' to program wrapping. Signed-off-by: Ludovic Courtès --- gnu/packages/gnucash.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index de916a8829..af017e108d 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu packages gnucash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages gnome) @@ -70,6 +72,8 @@ (define-public gnucash ("icu4c" ,icu4c) ("glib" ,glib) ("gtk" ,gtk+) + ("libdbi" ,libdbi) + ("libdbi-drivers" ,libdbi-drivers) ("libgnomecanvas" ,libgnomecanvas) ("libxml2" ,libxml2) ("libxslt" ,libxslt) @@ -89,8 +93,7 @@ (define-public gnucash (arguments `(#:test-target "check" #:configure-flags - (list "-DWITH_OFX=OFF" ; libofx is not available yet - "-DWITH_SQL=OFF") ; without dbi.h + (list "-DWITH_OFX=OFF") ; libofx is not available yet #:make-flags '("GUILE_AUTO_COMPILE=0") #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -147,6 +150,10 @@ (define-public gnucash (for-each (lambda (prog) (wrap-program (string-append (assoc-ref outputs "out") "/bin/" prog) + `("GNC_DBD_DIR" = + (,(string-append + (assoc-ref inputs "libdbi-drivers") + "/lib/dbd"))) `("PERL5LIB" ":" prefix ,(map (lambda (o) (string-append o "/lib/perl5/site_perl/"