From 25f4f78c924725115c2639e47b4b94b6a0449034 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Mar 2015 11:36:24 +0100
Subject: [PATCH] haskell-mysql: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 pkgs/development/haskell-modules/hackage-packages.nix     | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f634f3f55f..5a7eff594d1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -25,6 +25,9 @@ self: super: {
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
 
+  # Use the default version of mysql to build this package (which is actually mariadb).
+  mysql = super.mysql.override { inherit (pkgs) mysql; };
+
   # Please also remove optparse-applicative special case from
   # cabal2nix/hackage2nix.hs when removing the following.
   elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; };
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1a8a761cc85..fef222e1d66 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -84955,18 +84955,19 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mysql, zlib }:
+    ({ mkDerivation, base, bytestring, containers, mysql, openssl, zlib
+     }:
      mkDerivation {
        pname = "mysql";
        version = "0.1.1.7";
        sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0";
        buildDepends = [ base bytestring containers ];
        buildTools = [ mysql ];
-       extraLibraries = [ zlib ];
+       extraLibraries = [ openssl zlib ];
        homepage = "https://github.com/bos/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-     }) { mysql = null;  inherit (pkgs) zlib;};
+     }) { mysql = null;  inherit (pkgs) openssl;  inherit (pkgs) zlib;};
 
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql