From 843b9f332edc16b0dc8186dc445f8cd6fb9edd55 Mon Sep 17 00:00:00 2001 From: Allen Short Date: Wed, 5 Dec 2012 15:43:34 -0800 Subject: [PATCH 1/3] fixes for mysql on OSX 10.8 --- pkgs/servers/sql/mysql55/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index a5f588f747d..052e9dc4156 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr"; }; - buildInputs = [ cmake bison ncurses openssl readline zlib ]; + buildInputs = [ cmake bison ncurses openssl readline zlib perl ]; enableParallelBuilding = true; @@ -23,6 +23,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 From b90b8f222ba46709cb9b5d647ffcd2b066798135 Mon Sep 17 00:00:00 2001 From: Allen Short Date: Fri, 7 Dec 2012 09:31:10 -0800 Subject: [PATCH 2/3] only depend on perl on OSX --- pkgs/servers/sql/mysql55/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index 052e9dc4156..558c9925d11 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 perl ]; + buildInputs = if stdenv.isDarwin + then [ cmake bison ncurses openssl readline zlib perl ] + else [ cmake bison ncurses openssl readline zlib ]; enableParallelBuilding = true; From c6bf1f87f74436ae927720b09815e702b6f9cae1 Mon Sep 17 00:00:00 2001 From: Allen Short Date: Fri, 7 Dec 2012 09:36:31 -0800 Subject: [PATCH 3/3] better syntax thanks to aszlig --- pkgs/servers/sql/mysql55/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index 558c9925d11..81514494c07 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr"; }; - buildInputs = if stdenv.isDarwin - then [ cmake bison ncurses openssl readline zlib perl ] - else [ cmake bison ncurses openssl readline zlib ]; + buildInputs = [ cmake bison ncurses openssl readline zlib ] + ++ stdenv.lib.optional stdenv.isDarwin perl; + enableParallelBuilding = true;