diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-12-07 18:48:26 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-12-07 18:48:40 +0100 |
| commit | a9edaf10ed7570f66f17130c82a4e4170e80bfbb (patch) | |
| tree | c6e38302bd635acd79068c22b573c2366ee3dd96 /pkgs/servers | |
| parent | 5f8647e7ae71d4739bce444d6f371cf5185116cc (diff) | |
| parent | c6bf1f87f74436ae927720b09815e702b6f9cae1 (diff) | |
| download | nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.tar nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.tar.gz nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.tar.bz2 nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.tar.lz nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.tar.xz nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.tar.zst nixpkgs-a9edaf10ed7570f66f17130c82a4e4170e80bfbb.zip | |
Merge pull request #207 from washort/mysql55
And sorry to @washort for bugging him too much with the syntax.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/mysql55/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index a5f588f747d..81514494c07 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr"; }; - buildInputs = [ cmake bison ncurses openssl readline zlib ]; + buildInputs = [ cmake bison ncurses openssl readline zlib ] + ++ stdenv.lib.optional stdenv.isDarwin perl; + enableParallelBuilding = true; @@ -23,6 +25,9 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + prePatch = '' + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db rm -rf $out/mysql-test $out/sql-bench |