Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {

  # Use the default version of mysql to build this package (which is actually mariadb).
  # test phase requires networking
-  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });

  # CUDA needs help finding the SDK headers and libraries.
  cuda = overrideCabal super.cuda (drv: {