Merge branch 'staging-next'

2019-09-21 13:14:09 +02:00
parent f0fec244ca 22d7eb74d9
commit 41af38f372
90 changed files with 428 additions and 367 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:

 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

  createFindlibDestdir = true;

-  propagatedBuildInputs = [ mysql.connector-c ];
+  propagatedBuildInputs = [ libmysqlclient ];

  patches = [
    (fetchpatch {