From ab3fc34bcea1d5c732436f8329e0cc72bd3371c2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 18 Feb 2008 20:54:08 +0000
Subject: [PATCH] mysql: +libmysqld, +openssl

svn path=/nixpkgs/branches/stdenv-updates/; revision=10752
---
 pkgs/servers/sql/mysql5/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix
index d76a81184d2d..89107d108646 100644
--- a/pkgs/servers/sql/mysql5/default.nix
+++ b/pkgs/servers/sql/mysql5/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ps, ncurses, zlib ? null, perl}:
+args: with args;
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
     sha256 = "e4443d8dc859ed53bd9f3bef143ce30c7f5dee66a02748e9a003136be25e0060";
   };
 
-  buildInputs = [ps ncurses zlib perl];
+  buildInputs = [ps ncurses zlib perl openssl];
+  postInstall = "ln -s mysqld_safe $out/bin/mysqld";
 
-  configureFlags = "--enable-thread-safe-client";
+  configureFlags = "--enable-thread-safe-client --with-embedded-server --disable-static --with-openssl=${openssl} --with-berkeley-db";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7987cbf46fcb..644fab02a8a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3240,7 +3240,7 @@ rec {
   };
 
   mysql = import ../servers/sql/mysql5 {
-    inherit fetchurl stdenv ncurses zlib perl;
+    inherit fetchurl stdenv ncurses zlib perl openssl;
     ps = procps; /* !!! Linux only */
   };