From 22f5c0762423f7363c1e44f0a2d00fb6e7e81bd5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 19 Aug 2018 15:52:45 +0200
Subject: 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(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ac2e5a19ab..3116c86377 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)))
-- 
cgit v1.2.3