nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mariadb: Propagate OpenSSL. 

* gnu/packages/databases.scm (mariadb)[inputs]: Move OPENSSL ...
[propagated-inputs]: ... here.
(r-rmysql)[inputs]: Remove OPENSSL.
This commit is contained in:
Marius Bakke 2018-08-19 15:52:45 +02:00
parent aaaede49c1
commit 22f5c07624
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/databases.scm
View File

@ -792,11 +792,13 @@ Language.")
("libaio" ,libaio) ("libaio" ,libaio)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("openssl" ,openssl)
("pcre" ,pcre) ("pcre" ,pcre)
("snappy" ,snappy) ("snappy" ,snappy)
("xz" ,xz) ("xz" ,xz)
("zlib" ,zlib))) ("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 ;; 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. ;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours (properties '((timeout . 64800))) ;18 hours
@ -2167,9 +2169,6 @@ and web services platform functionality.")
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("mariadb" ,mariadb) `(("mariadb" ,mariadb)
;; FIXME: This should be propagated from MariaDB, but add it here
;; for now to prevent a large rebuild.
("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
`(("r-dbi" ,r-dbi))) `(("r-dbi" ,r-dbi)))