From patchwork Wed Nov 20 12:46:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 16162 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E1D2617792; Wed, 20 Nov 2019 12:49:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9BB8C17790 for ; Wed, 20 Nov 2019 12:49:16 +0000 (GMT) Received: from localhost ([::1]:57334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXPQ4-00044S-6G for patchwork@mira.cbaines.net; Wed, 20 Nov 2019 07:49:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59815) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXPOv-000379-0m for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXPOt-0004gg-PM for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40273) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXPOt-0004gY-Ax for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXPOs-0005eP-2w for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38298] [PATCH 1/3] gnu: Add libdbi. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2019 12:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38298@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38298-submit@debbugs.gnu.org id=B38298.157425403721620 (code B ref 38298); Wed, 20 Nov 2019 12:48:02 +0000 Received: (at 38298) by debbugs.gnu.org; 20 Nov 2019 12:47:17 +0000 Received: from localhost ([127.0.0.1]:49084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXPO8-0005cd-Mb for submit@debbugs.gnu.org; Wed, 20 Nov 2019 07:47:16 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXPO5-0005cB-RD for 38298@debbugs.gnu.org; Wed, 20 Nov 2019 07:47:14 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 697662400FD for <38298@debbugs.gnu.org>; Wed, 20 Nov 2019 13:47:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1574254027; bh=p3QD5OeKePA13Vj2WNzg5BFgWwWMCCeTKyXTp4bXOgw=; h=From:To:Cc:Subject:Date:From; b=qFIcsxh7rR9Wru+jUKjLMVGLSgeHYTnfyP5llDbFZFegEtFJl3Sh5xAQRfy8+tXTU rLbWk/BbeWRD9eNka/E61w0nyKz4a2quQPxfrAsiDcIhCsbBHtLz1ZrqcnBTLdzaAn ZbERcsaHkFAR3b0Q4sMWSiMsdmvu5FQuwLo/Jsdd3oJrZbX8GRUpUK9YKXZRdXLcfk w82hsM1mavjq4cqcasDgCVB+5a/ptpKFNlWVjmTC7/m6+WO6WdWj3o+E4M7ZOSWzSM /MovVCqBkIDku92Ryx1Q1Gz2CaXUNjci2mYA8UWXRENxUbHqIX9MHnRulQXlhYEtS+ O6tOTiQwVISRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47J2Wr3nlxz9rxb; Wed, 20 Nov 2019 13:47:03 +0100 (CET) From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:37 +0100 Message-Id: <20191120124639.8763-1-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <878soaraak.fsf@yamatai> References: <878soaraak.fsf@yamatai> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (libdbi): New variable. --- gnu/packages/databases.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index acce540e06..2ccaae205c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -3170,3 +3171,24 @@ NumPy, and other traditional Python scientific computing packages.") It implements the Python DB API 2.0 specification and includes support for SQLAlchemy.") (license license:asl2.0))) + +(define-public libdbi + (package + (name "libdbi") + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libdbi/libdbi/libdbi-" + version "/libdbi-" version ".tar.gz")) + (sha256 + (base32 + "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys")))) + (build-system gnu-build-system) + (synopsis "Database independent abstraction layer in C") + (description + "This library implements a database independent abstraction layer in C, +similar to the DBI/DBD layer in Perl. Writing one generic set of code, +programmers can leverage the power of multiple databases and multiple +simultaneous database connections by using this framework.") + (home-page "http://libdbi.sourceforge.net/") + (license license:lgpl2.1+))) From patchwork Wed Nov 20 12:46:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 16161 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5291C17793; Wed, 20 Nov 2019 12:48:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ECCFA17791 for ; Wed, 20 Nov 2019 12:48:16 +0000 (GMT) Received: from localhost ([::1]:57326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXPP6-0003D8-7L for patchwork@mira.cbaines.net; Wed, 20 Nov 2019 07:48:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59878) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXPOx-00039P-D5 for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXPOw-0004hl-2B for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXPOv-0004hg-V2 for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXPOt-0005eY-OI for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38298] [PATCH 2/3] gnu: Add libdbi-drivers. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2019 12:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38298@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38298-submit@debbugs.gnu.org id=B38298.157425406421674 (code B ref 38298); Wed, 20 Nov 2019 12:48:03 +0000 Received: (at 38298) by debbugs.gnu.org; 20 Nov 2019 12:47:44 +0000 Received: from localhost ([127.0.0.1]:49088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXPOW-0005dQ-3R for submit@debbugs.gnu.org; Wed, 20 Nov 2019 07:47:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXPOK-0005cq-AH for 38298@debbugs.gnu.org; Wed, 20 Nov 2019 07:47:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 951A12400FB for <38298@debbugs.gnu.org>; Wed, 20 Nov 2019 13:47:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1574254041; bh=8i9F1NoBKqzhkZWaNZptSxLj4qTSi5d3Xrx+Ep9KSPo=; h=From:To:Cc:Subject:Date:From; b=br+YbUKQv3e+DMHZDuVgEmY2aFhrryH4HiKIcV3iE1dDGX+o99JGG85o1AWGRV/Zg P7GGQhA8LktfYSfYCNC6FvshyWWom1FV7LOegcpa7sLPhrVm4jeqPFojTfY+Y7U94d qu/XWU9LF+GQI9f0v6cynxdsul9UoZfqboR1W+IQX5FUsTnWXhOEqsO+yptAPnz9xt UTYIxJCbEfkgOILqNLSb9iAgfRMHOXF4nvAL6UvL38aDSdqkd9QG+ZKF4mSW95QPvN 0FcrWDfoQhBWEDZuOie1l/7l5gDzIyd3ZNawqAA3llHw7ni+jWsbAdUDty3WszmouM F20e30zM7gbmQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47J2X74CMzz9rxQ; Wed, 20 Nov 2019 13:47:19 +0100 (CET) From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:38 +0100 Message-Id: <20191120124639.8763-2-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191120124639.8763-1-glv@posteo.net> References: <878soaraak.fsf@yamatai> <20191120124639.8763-1-glv@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (libdbi-drivers): New variable. --- gnu/packages/databases.scm | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2ccaae205c..4be5912022 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3192,3 +3192,71 @@ programmers can leverage the power of multiple databases and multiple simultaneous database connections by using this framework.") (home-page "http://libdbi.sourceforge.net/") (license license:lgpl2.1+))) + +(define-public libdbi-drivers + (package + (name "libdbi-drivers") + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libdbi-drivers/" + "libdbi-drivers/libdbi-drivers-" version + "/libdbi-drivers-" version ".tar.gz")) + (sha256 + (base32 + "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3")))) + (build-system gnu-build-system) + (native-inputs + `(("inetutils" ,inetutils) + ("glibc-locales" ,glibc-locales))) + (inputs + `(("libdbi" ,libdbi) + ("mysql" ,mariadb) + ("postgresql" ,postgresql) + ("sqlite" ,sqlite))) + (arguments + `(#:configure-flags + (let ((libdbi (assoc-ref %build-inputs "libdbi")) + (mysql (assoc-ref %build-inputs "mysql")) + (postgresql (assoc-ref %build-inputs "postgresql")) + (sqlite (assoc-ref %build-inputs "sqlite"))) + (list "--disable-docs" + (string-append "--with-dbi-incdir=" libdbi "/include") + (string-append "--with-dbi-libdir=" libdbi "/lib") + "--with-mysql" + (string-append "--with-mysql-incdir=" mysql "/include/mysql") + (string-append "--with-mysql-libdir=" mysql "/lib") + "--with-pgsql" + (string-append "--with-pgsql-incdir=" postgresql "/include") + (string-append "--with-pgsql-libdir=" postgresql "/lib") + "--with-sqlite3" + (string-append "--with-sqlite-incdir=" sqlite "/include") + (string-append "--with-sqlite-libdir=" sqlite "/lib"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/test_mysql.sh" + (("^MYMYSQLD=.*") + (string-append "MYMYSQLD=" + (assoc-ref inputs "mysql") + "/bin/mysqld"))) + #t)) + (add-after 'install 'remove-empty-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((var (string-append (assoc-ref outputs "out") "/var"))) + (delete-file-recursively var)) + #t))))) + (synopsis "Database drivers for the libdbi framework") + (description + "The @code{libdbi-drivers} library provides the database specific drivers +for the @code{libdbi} framework. + +The drivers officially supported by @code{libdbi} are: +@itemize +@item MySQL, +@item PostgreSQL, +@item SQLite. +@end itemize") + (home-page "http://libdbi-drivers.sourceforge.net/") + (license license:lgpl2.1+))) From patchwork Wed Nov 20 12:46:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 16163 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 886E617792; Wed, 20 Nov 2019 12:49:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 41BCB17790 for ; Wed, 20 Nov 2019 12:49:22 +0000 (GMT) Received: from localhost ([::1]:57336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXPQ9-0004AF-R1 for patchwork@mira.cbaines.net; Wed, 20 Nov 2019 07:49:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59883) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXPOx-00039g-Ma for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXPOw-0004i0-J9 for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40275) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXPOw-0004hq-Ff for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXPOw-0005ei-C3 for guix-patches@gnu.org; Wed, 20 Nov 2019 07:48:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38298] [PATCH 3/3] gnu: gnucash: Activate database support. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2019 12:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38298@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38298-submit@debbugs.gnu.org id=B38298.157425407521704 (code B ref 38298); Wed, 20 Nov 2019 12:48:06 +0000 Received: (at 38298) by debbugs.gnu.org; 20 Nov 2019 12:47:55 +0000 Received: from localhost ([127.0.0.1]:49094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXPOk-0005dz-NJ for submit@debbugs.gnu.org; Wed, 20 Nov 2019 07:47:54 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXPOi-0005dk-Ad for 38298@debbugs.gnu.org; Wed, 20 Nov 2019 07:47:52 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9EBA42400FB for <38298@debbugs.gnu.org>; Wed, 20 Nov 2019 13:47:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1574254066; bh=lyaWM2ZUit/qKNtPWv47/vOvFoqsNKB0clvzYW1bXCM=; h=From:To:Cc:Subject:Date:From; b=cfbJIhY3ILYkqSgA4vxQ3tpj1wjAMG9GHR10dvry8D/hc0fG/k9xDe9obLzSCVZzG qqVAJAQXcD+uzNYvzAM8URpbP/e0DAQghrAwPCyYsqI6hVntu1Z9H4QVabpeXmZaCg vYV2wsGMoO9sN+fiDeqsDd8qZmkBypbio/q9f8BHapddVYeIGvsFIXKjExpA7p70f2 1QfLd0xh6tfH+A0YzKZ5gcJ6nXHYQ9DQncB1ZMjBecfIX3MLAYhW2F2V/3jjzE21pt pNm7mUqzJ2iHF4u8vOqR7hvbOAMDIfHemsl+TcBPuS4HhHekZU5GwizRW7wwqFpkTo dc2RUvBTBqNUA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47J2Xd0Ktsz9rxc; Wed, 20 Nov 2019 13:47:44 +0100 (CET) From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:39 +0100 Message-Id: <20191120124639.8763-3-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191120124639.8763-1-glv@posteo.net> References: <878soaraak.fsf@yamatai> <20191120124639.8763-1-glv@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. --- 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 @@ #: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 @@ ("icu4c" ,icu4c) ("glib" ,glib) ("gtk" ,gtk+) + ("libdbi" ,libdbi) + ("libdbi-drivers" ,libdbi-drivers) ("libgnomecanvas" ,libgnomecanvas) ("libxml2" ,libxml2) ("libxslt" ,libxslt) @@ -89,8 +93,7 @@ (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 @@ (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/"