[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: mariadb: Propagate OpenSSL.
From: |
Marius Bakke |
Subject: |
01/02: gnu: mariadb: Propagate OpenSSL. |
Date: |
Wed, 22 Aug 2018 11:53:14 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 22f5c0762423f7363c1e44f0a2d00fb6e7e81bd5
Author: Marius Bakke <address@hidden>
Date: Sun Aug 19 15:52:45 2018 +0200
gnu: mariadb: Propagate OpenSSL.
* gnu/packages/databases.scm (mariadb)[inputs]: Move OPENSSL ...
[propagated-inputs]: ... here.
(r-rmysql)[inputs]: Remove OPENSSL.
---
gnu/packages/databases.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ac2e5a1..3116c86 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -792,11 +792,13 @@ Language.")
("libaio" ,libaio)
("libxml2" ,libxml2)
("ncurses" ,ncurses)
- ("openssl" ,openssl)
("pcre" ,pcre)
("snappy" ,snappy)
("xz" ,xz)
("zlib" ,zlib)))
+ (propagated-inputs
+ ;; mariadb.pc says -lssl -lcrypto, so propagate it.
+ `(("openssl" ,openssl)))
;; The test suite is very resource intensive and can take more than three
;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours
@@ -2167,9 +2169,6 @@ and web services platform functionality.")
`(("pkg-config" ,pkg-config)))
(inputs
`(("mariadb" ,mariadb)
- ;; FIXME: This should be propagated from MariaDB, but add it here
- ;; for now to prevent a large rebuild.
- ("openssl" ,openssl)
("zlib" ,zlib)))
(propagated-inputs
`(("r-dbi" ,r-dbi)))