git.iko.soy/typeable/nixpkgs
on master help sign in
* Added the MySQL ODBC connector.

* Enable unixODBC support in PHP. * Build MySQL with thread-safe client libraries. svn path=/nixpkgs/trunk/; revision=5045

commit9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a authorEelco Dolstra <eelco.dolstra@logicblox.com> dateWed 15 Mar 2006, 15:59 (21 years ago) parent3d24096
6 files changed+43−4
compare with master
unifiedsplit
pkgs/development/interpreters/php/builder.sh+9−1 pkgs/development/interpreters/php/default.nix+7−2 pkgs/development/libraries/mysql-connector-odbc/builder.sh+7 pkgs/development/libraries/mysql-connector-odbc/default.nix+13 pkgs/servers/sql/mysql/default.nix+2 pkgs/system/all-packages-generic.nix+5−1
pkgs/development/interpreters/php/builder.sh+9−1
@@ -2,7 +2,15 @@ source $stdenv/setup
22
33alias lex=flex
44
5−configureFlags="--with-libxml-dir=$libxml2 --with-apxs2=$apacheHttpd/bin/apxs --with-apr-util=$apacheHttpd"
5+configureFlags="$configureFlags \
6+ --with-libxml-dir=$libxml2 \
7+ --with-apxs2=$apacheHttpd/bin/apxs \
8+ --with-apr-util=$apacheHttpd"
9+
10+if test -n "$unixODBC"; then
11+ configureFlags="$configureFlags --with-unixODBC=$unixODBC"
12+fi
13+
614makeFlags="APXS_LIBEXECDIR=$out/modules $makeFlags"
715
816genericBuild
pkgs/development/interpreters/php/default.nix+7−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd}:
1+{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd, unixODBC ? null}:
22
33assert libxml2 != null;
44
@@ -11,8 +11,13 @@ stdenv.mkDerivation {
1111
1212 inherit flex bison libxml2 apacheHttpd;
1313
14− buildInputs = [flex bison libxml2 apacheHttpd];
1514 builder = ./builder.sh;
1615
16+ buildInputs = [flex bison libxml2 apacheHttpd];
17+
18+ inherit unixODBC;
19+
20+ odbcSupport = unixODBC != null;
21+
1722 patches = [./fix.patch];
1823}
pkgs/development/libraries/mysql-connector-odbc/builder.shnew file+7
@@ -0,0 +1,7 @@
1+source $stdenv/setup
2+
3+configureFlags="$configureFlags \
4+ --with-mysql-path=$mysql \
5+ --with-unixODBC=$unixODBC"
6+
7+genericBuild
pkgs/development/libraries/mysql-connector-odbc/default.nixnew file+13
@@ -0,0 +1,13 @@
1+{stdenv, fetchurl, mysql, libtool, zlib, unixODBC}:
2+
3+stdenv.mkDerivation {
4+ name = "mysql-connector-odbc-3.51.12";
5+ builder = ./builder.sh;
6+ src = fetchurl {
7+ url = http://ftp.snt.utwente.nl/pub/software/mysql/Downloads/MyODBC3/mysql-connector-odbc-3.51.12.tar.gz;
8+ md5 = "a484f590464fb823a8f821b2f1fd7fef";
9+ };
10+ configureFlags = "--disable-gui";
11+ buildInputs = [libtool zlib];
12+ inherit mysql unixODBC;
13+}
pkgs/servers/sql/mysql/default.nix+2
@@ -11,4 +11,6 @@ stdenv.mkDerivation {
1111 };
1212
1313 buildInputs = [ps ncurses zlib perl];
14+
15+ configureFlags = "--enable-thread-safe-client";
1416}
pkgs/system/all-packages-generic.nix+5−1
@@ -808,7 +808,7 @@ rec {
808808 };
809809
810810 php = (import ../development/interpreters/php) {
811− inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
811+ inherit stdenv fetchurl flex bison libxml2 apacheHttpd unixODBC;
812812 };
813813
814814 guile = (import ../development/interpreters/guile) {
@@ -1252,6 +1252,10 @@ rec {
12521252 inherit fetchurl stdenv;
12531253 };
12541254
1255+ mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
1256+ inherit fetchurl stdenv mysql libtool zlib unixODBC;
1257+ };
1258+
12551259 ### DEVELOPMENT / LIBRARIES / JAVA
12561260
12571261 saxon = (import ../development/libraries/java/saxon) {