diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-19 15:52:45 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 17:50:07 +0200 |
| commit | 22f5c0762423f7363c1e44f0a2d00fb6e7e81bd5 (patch) | |
| tree | ca6e83b681d6546e1f447fd5e6691251ecb30f00 /gnu/packages/databases.scm | |
| parent | aaaede49c1aacb43ffec8ad2cf34bcc764b3ff2a (diff) | |
| download | guix-22f5c0762423f7363c1e44f0a2d00fb6e7e81bd5.tar.gz | |
gnu: mariadb: Propagate OpenSSL.
* gnu/packages/databases.scm (mariadb)[inputs]: Move OPENSSL ... [propagated-inputs]: ... here. (r-rmysql)[inputs]: Remove OPENSSL.
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 7 |
1 files changed, 3 insertions, 4 deletions
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))) |