public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mysql: Use libs in place of the binary mysql

Browse Source
This commit is contained in:
William A. Kennington III
2015-04-01 16:39:50 -07:00
parent bc7b39784a
commit a604b42480
28 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/php/5.4.nix
View File

@@ -87,13 +87,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
@@ -103,8 +103,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {

12
pkgs/development/interpreters/php/5.5.nix
View File

@@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
@@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {

12
pkgs/development/interpreters/php/5.6.nix
View File

@@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
@@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {

2
pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
View File

@@ -57,7 +57,7 @@ in
};
mysql2 = attrs: {
buildInputs = [ mysql zlib openssl ];
buildInputs = [ mysql.lib zlib openssl ];
};
ncursesw = attrs: {