From 5b9c5c62be7c37cba5103d7b3fc31175214f89f3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 21 Apr 2009 13:22:38 +0000 Subject: [PATCH] Added some MySQL fixes in order to have a working libmysqld library on x86_64-linux svn path=/nixpkgs/branches/stdenv-updates/; revision=15215 --- pkgs/servers/sql/mysql5/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix index 4666530929e..3bd0da49379 100644 --- a/pkgs/servers/sql/mysql5/default.nix +++ b/pkgs/servers/sql/mysql5/default.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation { buildInputs = [ps ncurses zlib perl openssl]; - configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server"; + configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" + + (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); + + NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + + NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; postInstall = ''