From 1ce65f5cff1c7d3b65f51b9c1e42020295129b9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 5 May 2020 16:46:10 +0200 Subject: gnu: SOCI: Build with MariaDB instead of MySQL. * gnu/packages/databases.scm (soci)[inputs]: Remove MYSQL. Add MARIADB:DEV and MARIADB:LIB. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 23b8f14c54..fb12ca7f7e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3458,7 +3458,8 @@ The drivers officially supported by @code{libdbi} are: ("sqlite" ,sqlite) ("odbc" ,unixodbc) ("boost" ,boost) - ("mysql" ,mysql))) + ("mariadb:dev" ,mariadb "dev") + ("mariadb:lib" ,mariadb "lib"))) (arguments `(#:tests? #f ; Tests may require running database management systems. #:phases -- cgit v1.2.3 From 85a906dc58bffa588762d91502db07eb1bd74889 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 5 May 2020 16:46:46 +0200 Subject: gnu: SOCI: Return #t from all phases. * gnu/packages/databases.scm (soci)[arguments]: Return #t from phase. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fb12ca7f7e..c78d32efee 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3467,7 +3467,8 @@ The drivers officially supported by @code{libdbi} are: (add-after 'unpack 'fix-lib-path (lambda _ (substitute* "CMakeLists.txt" - (("set\\(SOCI_LIBDIR \"lib64\"\\)") ""))))))) + (("set\\(SOCI_LIBDIR \"lib64\"\\)") "")) + #t))))) (synopsis "C++ Database Access Library") (description "SOCI is an abstraction layer for several database backends, including -- cgit v1.2.3