summary refs log tree commit diff
path: root/pkgs/system/all-packages-generic.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-03-15 15:59:20 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-03-15 15:59:20 +0000
commit9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a (patch)
tree73072f1871b87f2173446c02621f5159022346c5 /pkgs/system/all-packages-generic.nix
parent3d240964312a30ea2b44fb99b9cc0e28a6d9823c (diff)
downloadnixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.tar
nixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.tar.gz
nixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.tar.bz2
nixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.tar.lz
nixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.tar.xz
nixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.tar.zst
nixpkgs-9f1b5e24ad73e2852c9bed7922a9a3afa5b1bb4a.zip
* Added the MySQL ODBC connector.
* Enable unixODBC support in PHP.
* Build MySQL with thread-safe client libraries.

svn path=/nixpkgs/trunk/; revision=5045
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r--pkgs/system/all-packages-generic.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 3bbcfe4d3c0..8c255d21560 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -808,7 +808,7 @@ rec {
   };
 
   php = (import ../development/interpreters/php) {
-    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
+    inherit stdenv fetchurl flex bison libxml2 apacheHttpd unixODBC;
   };
 
   guile = (import ../development/interpreters/guile) {
@@ -1252,6 +1252,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
+    inherit fetchurl stdenv mysql libtool zlib unixODBC;
+  };
+
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   saxon = (import ../development/libraries/java/saxon) {