about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2008-06-11 23:03:30 +0000
committerMarc Weber <marco-oweber@gmx.de>2008-06-11 23:03:30 +0000
commit9dd45a58cf552196f4d62502c7c5f8e072316c53 (patch)
tree9b0b1fd463448e741bc0285c6e36d7fd6a3e19e4 /pkgs/top-level
parent0e722781806c2d87b8e2b810144dc08b11faba8a (diff)
downloadnixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.tar
nixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.tar.gz
nixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.tar.bz2
nixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.tar.lz
nixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.tar.xz
nixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.tar.zst
nixlib-9dd45a58cf552196f4d62502c7c5f8e072316c53.zip
added unixODBCDrivers expression containing unixODBC Postgres connector driver
integrating prior pkgs/development/libraries/mysql-connector-odbc/default.nix driver
Also provides ini strings for assembling /etc/odbcinst.ini

svn path=/nixpkgs/trunk/; revision=12044
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e40daac86478..d9f080715975 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3113,10 +3113,6 @@ let pkgs = rec {
     inherit fetchurl stdenv python;
   };
 
-  mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
-    inherit fetchurl stdenv mysql libtool zlib unixODBC;
-  };
-
   ncursesFun = lib.sumArgs (import ../development/libraries/ncurses) {
     inherit fetchurl stdenv;
     unicode = (system != "i686-cygwin");
@@ -3332,6 +3328,11 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
+  unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
+    inherit fetchurl stdenv unixODBC glibc libtool openssl zlib;
+    inherit postgresql mysql;
+  });
+
   wxGTK = wxGTK26;
 
   wxGTK26 = import ../development/libraries/wxGTK-2.6 {